Fix import during registration (fix #352)

Signed-off-by: Daniele Ricci <[email protected]>
kontalk · Mar 22, 2015 · a6e6e61 · a6e6e61
1 parent b63f60f
commit a6e6e61
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/app/src/main/java/org/kontalk/client/NumberValidator.java b/app/src/main/java/org/kontalk/client/NumberValidator.java
@@ -414,7 +414,16 @@ private void initConnection() throws XMPPException, SmackException,
 
         if (!mConnector.isConnected() || mConnector.isServerDirty()) {
             mConnector.setListener(this);
-            mConnector.connectOnce(mKey != null ? mKey.copy(mBridgeCert) : null);
+            PersonalKey key = null;
+            if (mImportedPrivateKey != null && mImportedPublicKey != null) {
+                PGPKeyPairRing ring = PGPKeyPairRing.load(mImportedPrivateKey, mImportedPublicKey);
+                key = PersonalKey.load(ring.secretKey, ring.publicKey, mPassphrase, mBridgeCert);
+            }
+            else if (mKey != null) {
+                key = mKey.copy(mBridgeCert);
+            }
+
+            mConnector.connectOnce(key);
         }
     }
 

diff --git a/app/src/main/java/org/kontalk/crypto/PersonalKey.java b/app/src/main/java/org/kontalk/crypto/PersonalKey.java
@@ -286,6 +286,17 @@ public static PersonalKey load(byte[] privateKeyData, byte[] publicKeyData, Stri
         return load(secRing, pubRing, passphrase, bridgeCert);
     }
 
+    /** Creates a {@link PersonalKey} from private and public key byte buffers. */
+    public static PersonalKey load(byte[] privateKeyData, byte[] publicKeyData, String passphrase, X509Certificate bridgeCert)
+        throws PGPException, IOException, CertificateException, NoSuchProviderException {
+
+        KeyFingerPrintCalculator fpr = new BcKeyFingerprintCalculator();
+        PGPSecretKeyRing secRing = new PGPSecretKeyRing(privateKeyData, fpr);
+        PGPPublicKeyRing pubRing = new PGPPublicKeyRing(publicKeyData, fpr);
+
+        return load(secRing, pubRing, passphrase, bridgeCert);
+    }
+
     @SuppressWarnings("unchecked")
     public static PersonalKey load(PGPSecretKeyRing secRing, PGPPublicKeyRing pubRing, String passphrase, X509Certificate bridgeCert)
             throws PGPException, IOException, CertificateException, NoSuchProviderException {