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, 3 insertions, 2 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceImpl.java b/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceImpl.java
index 4bc27a7d..5e302011 100644
--- a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceImpl.java
+++ b/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceImpl.java
@@ -34,6 +34,7 @@ import java.util.Random;
 import java.util.Set;
 
 import de.thedevstack.conversationsplus.Config;
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Contact;
 import de.thedevstack.conversationsplus.entities.Conversation;
@@ -462,7 +463,7 @@ public class AxolotlServiceImpl implements OnAdvancedStreamFeaturesLoaded, Axolo
 			PrivateKey x509PrivateKey = KeyChain.getPrivateKey(mXmppConnectionService, account.getPrivateKeyAlias());
 			X509Certificate[] chain = KeyChain.getCertificateChain(mXmppConnectionService, account.getPrivateKeyAlias());
 			Signature verifier = Signature.getInstance("sha256WithRSA");
-			verifier.initSign(x509PrivateKey,mXmppConnectionService.getRNG());
+			verifier.initSign(x509PrivateKey, ConversationsPlusApplication.getSecureRandom());
 			verifier.update(axolotlPublicKey.serialize());
 			byte[] signature = verifier.sign();
 			IqPacket packet = mXmppConnectionService.getIqGenerator().publishVerification(signature, chain, getOwnDeviceId());
@@ -669,7 +670,7 @@ public class AxolotlServiceImpl implements OnAdvancedStreamFeaturesLoaded, Axolo
 							verifier.update(identityKey.serialize());
 							if (verifier.verify(verification.second)) {
 								try {
-									mXmppConnectionService.getMemorizingTrustManager().getNonInteractive().checkClientTrusted(verification.first, "RSA");
+									ConversationsPlusApplication.getMemorizingTrustManager().getNonInteractive().checkClientTrusted(verification.first, "RSA");
 									String fingerprint = session.getFingerprint();
 									Log.d(Config.LOGTAG, "verified session with x.509 signature. fingerprint was: "+fingerprint);
 									setFingerprintTrust(fingerprint, XmppAxolotlSession.Trust.TRUSTED_X509);