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

---
 .../de/thedevstack/conversationsplus/ui/ConversationActivity.java    | 3 ++-
 .../de/thedevstack/conversationsplus/ui/ConversationFragment.java    | 4 ++--
 .../java/de/thedevstack/conversationsplus/ui/SettingsActivity.java   | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
index de69c1e6..99d26b64 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
@@ -45,6 +45,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.http.HttpConnectionManager;
 import de.thedevstack.conversationsplus.ui.dialogs.UserDecisionDialog;
 import de.thedevstack.conversationsplus.ui.listeners.ResizePictureUserDecisionListener;
 import de.thedevstack.conversationsplus.utils.ConversationUtil;
@@ -620,7 +621,7 @@ public class ConversationActivity extends XmppActivity
 				Toast.makeText(this, R.string.not_connected_try_again, Toast.LENGTH_SHORT).show();
 			}
 		} else if (message.treatAsDownloadable() != Message.Decision.NEVER) {
-			xmppConnectionService.getHttpConnectionManager().createNewDownloadConnection(message, true);
+			HttpConnectionManager.createNewDownloadConnection(message, true);
 		}
 	}
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
index f065a25b..d6e6f34c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
@@ -46,6 +46,7 @@ import java.util.Collections;
 import java.util.List;
 
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.http.HttpConnectionManager;
 import de.thedevstack.conversationsplus.http.HttpDownloadConnection;
 import de.thedevstack.conversationsplus.ui.dialogs.MessageDetailsDialog;
 import de.thedevstack.conversationsplus.Config;
@@ -685,8 +686,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 	}
 
 	private void downloadFile(Message message) {
-		activity.xmppConnectionService.getHttpConnectionManager()
-				.createNewDownloadConnection(message,true);
+		HttpConnectionManager.createNewDownloadConnection(message,true);
 	}
 
 	private void cancelTransmission(Message message) {
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
index 84eb7016..296f8f4f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Locale;
 
 import de.duenndns.ssl.MemorizingTrustManager;
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.services.ExportLogsService;
 import de.tzur.conversations.Settings;
 import de.thedevstack.conversationsplus.R;
@@ -71,7 +72,7 @@ public class SettingsActivity extends XmppActivity implements
 		removeCertsPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
 			@Override
 			public boolean onPreferenceClick(Preference preference) {
-				final MemorizingTrustManager mtm = xmppConnectionService.getMemorizingTrustManager();
+				final MemorizingTrustManager mtm = ConversationsPlusApplication.getMemorizingTrustManager();
 				final ArrayList<String> aliases = Collections.list(mtm.getCertificates());
 				if (aliases.size() == 0) {
 					displayToast(getString(R.string.toast_no_trusted_certs));
@@ -178,7 +179,7 @@ public class SettingsActivity extends XmppActivity implements
 				xmppConnectionService.refreshAllPresences();
 			}
 		} else if (name.equals("dont_trust_system_cas")) {
-			xmppConnectionService.updateMemorizingTrustmanager();
+			ConversationsPlusApplication.updateMemorizingTrustmanager();
 			reconnectAccounts();
 		} else if ("parse_emoticons".equals(name)) {
             EmojiconHandler.setParseEmoticons(Settings.PARSE_EMOTICONS);
-- 
cgit v1.2.3