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

1 files changed, 23 insertions, 95 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
index 9c0e55db..83cefc80 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
@@ -12,7 +12,6 @@ import android.graphics.Bitmap;
 import android.media.AudioManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
@@ -58,8 +57,7 @@ import de.duenndns.ssl.MemorizingTrustManager;
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
-import de.thedevstack.conversationsplus.exceptions.FileCopyException;
-import de.thedevstack.conversationsplus.utils.FileUtils;
+import de.thedevstack.conversationsplus.services.filetransfer.FileTransferManager;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
@@ -97,7 +95,6 @@ import de.thedevstack.conversationsplus.ui.UiCallback;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
 import de.thedevstack.conversationsplus.utils.ExceptionHelper;
 import de.thedevstack.conversationsplus.utils.OnPhoneContactsLoadedListener;
-import de.thedevstack.conversationsplus.utils.PRNGFixes;
 import de.thedevstack.conversationsplus.utils.PhoneHelper;
 import de.thedevstack.conversationsplus.utils.Xmlns;
 import de.thedevstack.conversationsplus.xml.Element;
@@ -148,7 +145,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			startService(intent);
 		}
 	};
-	private MemorizingTrustManager mMemorizingTrustManager;
 	private NotificationService mNotificationService = new NotificationService(
 			this);
 	private OnMessagePacketReceived mMessageParser = new MessageParser(this);
@@ -169,8 +165,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	private MessageGenerator mMessageGenerator = new MessageGenerator();
 	private PresenceGenerator mPresenceGenerator = new PresenceGenerator();
 	private List<Account> accounts;
-	private JingleConnectionManager mJingleConnectionManager = new JingleConnectionManager(
-			this);
+	private JingleConnectionManager mJingleConnectionManager = new JingleConnectionManager();
 	public OnContactStatusChanged onContactStatusChanged = new OnContactStatusChanged() {
 
 		@Override
@@ -197,8 +192,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			}
 		}
 	};
-	private HttpConnectionManager mHttpConnectionManager = new HttpConnectionManager(
-			this);
 	private MessageArchiveService mMessageArchiveService = new MessageArchiveService(this);
 	private PushManagementService mPushManagementService = new PushManagementService(this);
 	private OnConversationUpdate mOnConversationUpdate = null;
@@ -239,7 +232,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	private int mucRosterChangedListenerCount = 0;
 	private OnKeyStatusUpdated mOnKeyStatusUpdated = null;
 	private int keyStatusUpdatedListenerCount = 0;
-	private SecureRandom mRandom;
 	private LruCache<Pair<String,String>,ServiceDiscoveryResult> discoCache = new LruCache<>(20);
 	private final OnBindListener mOnBindListener = new OnBindListener() {
 
@@ -311,7 +303,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						&& checkListeners();
 				Logging.d(Config.LOGTAG,account.getJid().toBareJid()+": push mode "+Boolean.toString(pushMode));
 				if (!disabled && !pushMode) {
-					int timeToReconnect = mRandom.nextInt(20) + 10;
+					int timeToReconnect = ConversationsPlusApplication.getSecureRandom().nextInt(20) + 10;
 					scheduleWakeUpCall(timeToReconnect, account.getUuid().hashCode());
 				}
 			} else if (account.getStatus() == Account.State.REGISTRATION_SUCCESSFUL) {
@@ -334,8 +326,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	private OpenPgpServiceConnection pgpServiceConnection;
 	private PgpEngine mPgpEngine = null;
 	private WakeLock wakeLock;
-	private PowerManager pm;
-	private LruCache<String, Bitmap> mBitmapCache;
 	private Thread mPhoneContactMergerThread;
 	private EventReceiver mEventReceiver = new EventReceiver();
 
@@ -577,17 +567,8 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	@Override
 	public void onCreate() {
 		ExceptionHelper.init(getApplicationContext());
-		PRNGFixes.apply();
-		this.mRandom = new SecureRandom();
-		updateMemorizingTrustmanager();
 		final int maxMemory = (int) (Runtime.getRuntime().maxMemory() / 1024);
 		final int cacheSize = maxMemory / 8;
-		this.mBitmapCache = new LruCache<String, Bitmap>(cacheSize) {
-			@Override
-			protected int sizeOf(final String key, final Bitmap bitmap) {
-				return bitmap.getByteCount() / 1024;
-			}
-		};
 
 		this.databaseBackend = DatabaseBackend.getInstance(getApplicationContext());
 		this.accounts = databaseBackend.getAccounts();
@@ -614,8 +595,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			this.pgpServiceConnection.bindToService();
 		}
 
-		this.pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-		this.wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "XmppConnectionService");
+		this.wakeLock = ConversationsPlusApplication.createPartialWakeLock("XmppConnectionService");
 		toggleForegroundService();
 		updateUnreadCountBadge();
         UiUpdateHelper.initXmppConnectionService(this);
@@ -628,7 +608,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		super.onTrimMemory(level);
 		if (level >= TRIM_MEMORY_COMPLETE) {
 			Log.d(Config.LOGTAG, "clear cache due to low memory");
-			getBitmapCache().evictAll();
+			ImageUtil.evictBitmapCache();
 		}
 	}
 
@@ -739,16 +719,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 	}
 
-	private void sendFileMessage(final Message message, final boolean delay) {
-		Logging.d(Config.LOGTAG, "send file message");
-		final Account account = message.getConversation().getAccount();
-		if (account.httpUploadAvailable(FileBackend.getFile(message,false).getSize())) {
-			mHttpConnectionManager.createNewUploadConnection(message, delay);
-		} else {
-			mJingleConnectionManager.createNewConnection(message);
-		}
-	}
-
 	public void sendMessage(final Message message) {
 		sendMessage(message, false, false);
 	}
@@ -776,28 +746,23 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 
 		if (account.isOnlineAndConnected()) {
+            FileTransferManager fileTransferManager = FileTransferManager.getInstance();
 			switch (message.getEncryption()) {
 				case Message.ENCRYPTION_NONE:
-					if (message.needsUploading()) {
-						if (account.httpUploadAvailable(FileBackend.getFile(message,false).getSize())
-								|| message.fixCounterpart()) {
-							this.sendFileMessage(message, delay);
-						} else {
-							break;
-						}
+					if (fileTransferManager.accept(message)) {
+                        if (!fileTransferManager.transferFile(message, delay)) {
+                            break;
+                        }
 					} else {
 						packet = mMessageGenerator.generateChat(message);
 					}
 					break;
 				case Message.ENCRYPTION_PGP:
 				case Message.ENCRYPTION_DECRYPTED:
-					if (message.needsUploading()) {
-						if (account.httpUploadAvailable(FileBackend.getFile(message,false).getSize())
-								|| message.fixCounterpart()) {
-							this.sendFileMessage(message, delay);
-						} else {
-							break;
-						}
+                    if (fileTransferManager.accept(message)) {
+                        if (!fileTransferManager.transferFile(message, delay)) {
+                            break;
+                        }
 					} else {
 						packet = mMessageGenerator.generatePgpChat(message);
 					}
@@ -810,7 +775,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						} catch (InvalidJidException e) {
 							break;
 						}
-						if (message.needsUploading()) {
+						if (message.needsUploading()) { //TODO: Use FileTransferManager with a preselection of filetransfer method
 							mJingleConnectionManager.createNewConnection(message);
 						} else {
 							packet = mMessageGenerator.generateOtrChat(message);
@@ -828,13 +793,10 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					break;
 				case Message.ENCRYPTION_AXOLOTL:
 					message.setFingerprint(account.getAxolotlService().getOwnFingerprint());
-					if (message.needsUploading()) {
-						if (account.httpUploadAvailable(FileBackend.getFile(message,false).getSize())
-								|| message.fixCounterpart()) {
-							this.sendFileMessage(message, delay);
-						} else {
-							break;
-						}
+                    if (fileTransferManager.accept(message)) {
+                        if (!fileTransferManager.transferFile(message, delay)) {
+                            break;
+                        }
 					} else {
 						XmppAxolotlMessage axolotlMessage = account.getAxolotlService().fetchAxolotlMessageFromCache(message);
 						if (axolotlMessage == null) {
@@ -1331,7 +1293,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						callback.onAccountCreated(account);
 						if (Config.X509_VERIFICATION) {
 							try {
-								getMemorizingTrustManager().getNonInteractive().checkClientTrusted(chain, "RSA");
+								ConversationsPlusApplication.getMemorizingTrustManager().getNonInteractive().checkClientTrusted(chain, "RSA");
 							} catch (CertificateException e) {
 								callback.informUser(R.string.certificate_chain_is_not_trusted);
 							}
@@ -1359,7 +1321,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				databaseBackend.updateAccount(account);
 				if (Config.X509_VERIFICATION) {
 					try {
-						getMemorizingTrustManager().getNonInteractive().checkClientTrusted(chain, "RSA");
+                        ConversationsPlusApplication.getMemorizingTrustManager().getNonInteractive().checkClientTrusted(chain, "RSA");
 					} catch (CertificateException e) {
 						showErrorToastInUi(R.string.certificate_chain_is_not_trusted);
 					}
@@ -1901,7 +1863,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					}
 					return;
 				}
-				String name = new BigInteger(75, getRNG()).toString(32);
+				String name = new BigInteger(75, ConversationsPlusApplication.getSecureRandom()).toString(32);
 				Jid jid = Jid.fromParts(name, server, null);
 				final Conversation conversation = findOrCreateConversation(account, jid, true);
 				joinMuc(conversation, new OnConferenceJoined() {
@@ -2170,7 +2132,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public boolean renewSymmetricKey(Conversation conversation) {
 		Account account = conversation.getAccount();
 		byte[] symmetricKey = new byte[32];
-		this.mRandom.nextBytes(symmetricKey);
+		ConversationsPlusApplication.getSecureRandom().nextBytes(symmetricKey);
 		Session otrSession = conversation.getOtrSession();
 		if (otrSession != null) {
 			MessagePacket packet = new MessagePacket();
@@ -2440,36 +2402,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 	}
 
-	public SecureRandom getRNG() {
-		return this.mRandom;
-	}
-
-	public MemorizingTrustManager getMemorizingTrustManager() {
-		return this.mMemorizingTrustManager;
-	}
-
-	public void setMemorizingTrustManager(MemorizingTrustManager trustManager) {
-		this.mMemorizingTrustManager = trustManager;
-	}
-
-	public void updateMemorizingTrustmanager() {
-		final MemorizingTrustManager tm;
-		if (ConversationsPlusPreferences.dontTrustSystemCAs()) {
-			 tm = new MemorizingTrustManager(getApplicationContext(), null);
-		} else {
-			tm = new MemorizingTrustManager(getApplicationContext());
-		}
-		setMemorizingTrustManager(tm);
-	}
-
-	public PowerManager getPowerManager() {
-		return this.pm;
-	}
-
-	public LruCache<String, Bitmap> getBitmapCache() {
-		return this.mBitmapCache;
-	}
-
 	public void syncRosterToDisk(final Account account) {
 		Runnable runnable = new Runnable() {
 
@@ -2599,10 +2531,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		return this.mNotificationService;
 	}
 
-	public HttpConnectionManager getHttpConnectionManager() {
-		return this.mHttpConnectionManager;
-	}
-
 	public void resendFailedMessages(final Message message) {
         if (message.getStatus() == Message.STATUS_SEND_FAILED) {
             message.setTime(System.currentTimeMillis());