From b1ab7347b92329512bebe57f6624cae33c27036f Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Sun, 29 May 2016 20:33:36 +0200
Subject: FileTransfer reworked (first steps - functionality as is), HttpUpload
 separated, some bugfixes - HttpUpload moved into own package - FileTransfer
 managed by a central manager class, several   FileTransferService
 implementation can be used   - Security initializations moved to
 ConversationsPlusApplication   - Access to PowerManager moved to
 ConversationsPlusApplication   - Removed unused code fragments   - Access to
 HttpConnectionManager is now static

---
 .../thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java  | 4 ++--
 .../conversationsplus/xmpp/jingle/JingleConnectionManager.java       | 4 ----
 .../conversationsplus/xmpp/jingle/JingleSocks5Transport.java         | 5 +++--
 3 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/jingle')

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
index 422bdff0..ca823926 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
@@ -33,6 +33,7 @@ import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.services.AbstractConnectionManager;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.FileUtils;
+import de.thedevstack.conversationsplus.utils.XmppConnectionServiceAccessor;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
@@ -157,8 +158,7 @@ public class JingleConnection implements Transferable {
 
 	public JingleConnection(JingleConnectionManager mJingleConnectionManager) {
 		this.mJingleConnectionManager = mJingleConnectionManager;
-		this.mXmppConnectionService = mJingleConnectionManager
-				.getXmppConnectionService();
+		this.mXmppConnectionService = XmppConnectionServiceAccessor.xmppConnectionService;
 	}
 
 	public String getSessionId() {
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
index 2deb79c6..30ed9024 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
@@ -31,10 +31,6 @@ public class JingleConnectionManager extends AbstractConnectionManager {
 	@SuppressLint("TrulyRandom")
 	private SecureRandom random = new SecureRandom();
 
-	public JingleConnectionManager(XmppConnectionService service) {
-		super(service);
-	}
-
 	public void deliverPacket(Account account, JinglePacket packet) {
 		if (packet.isAction("session-initiate")) {
 			JingleConnection connection = new JingleConnection(this);
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java
index 9ea268d5..6480251f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java
@@ -14,6 +14,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
 import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.utils.StreamUtil;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.DownloadableFile;
@@ -84,7 +85,7 @@ public class JingleSocks5Transport extends JingleTransport {
 			@Override
 			public void run() {
 				InputStream fileInputStream = null;
-				final PowerManager.WakeLock wakeLock = connection.getConnectionManager().createWakeLock("jingle_send_"+connection.getSessionId());
+				final PowerManager.WakeLock wakeLock = ConversationsPlusApplication.createPartialWakeLock("jingle_send_"+connection.getSessionId());
 				try {
 					wakeLock.acquire();
 					MessageDigest digest = MessageDigest.getInstance("SHA-1");
@@ -134,7 +135,7 @@ public class JingleSocks5Transport extends JingleTransport {
 			@Override
 			public void run() {
 				OutputStream fileOutputStream = null;
-				final PowerManager.WakeLock wakeLock = connection.getConnectionManager().createWakeLock("jingle_receive_"+connection.getSessionId());
+				final PowerManager.WakeLock wakeLock = ConversationsPlusApplication.createPartialWakeLock("jingle_receive_"+connection.getSessionId());
 				try {
 					wakeLock.acquire();
 					MessageDigest digest = MessageDigest.getInstance("SHA-1");
-- 
cgit v1.2.3