Make bit size optional

3 files changed, 5 insertions, 6 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
index dafa3aeed..854a90713 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
@@ -73,7 +73,10 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         }
         dest.writeString(mFingerprintHex);
         dest.writeString(mKeyIdHex);
-        dest.writeInt(mBitStrength);
+        dest.writeInt(mBitStrength == null ? 0 : 1);
+        if (mBitStrength != null) {
+            dest.writeInt(mBitStrength);
+        }
         dest.writeString(mAlgorithm);
         dest.writeByte((byte) (mSecretKey ? 1 : 0));
         dest.writeByte((byte) (mSelected ? 1 : 0));
@@ -94,7 +97,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
             vr.mDate = source.readInt() != 0 ? new Date(source.readLong()) : null;
             vr.mFingerprintHex = source.readString();
             vr.mKeyIdHex = source.readString();
-            vr.mBitStrength = source.readInt();
+            vr.mBitStrength = source.readInt() != 0 ? source.readInt() : null;
             vr.mAlgorithm = source.readString();
             vr.mSecretKey = source.readByte() == 1;
             vr.mSelected = source.readByte() == 1;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java
index 791c44503..1e2f37637 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java
@@ -389,8 +389,6 @@ public class AddKeysActivity extends ActionBarActivity implements
                     certifyIntent.putExtra(MultiCertifyKeyActivity.EXTRA_KEY_IDS, result.getImportedMasterKeyIds());
                     certifyIntent.putExtra(MultiCertifyKeyActivity.EXTRA_CERTIFY_KEY_ID, mExchangeMasterKeyId);
                     startActivity(certifyIntent);
-
-                    result.createNotify(AddKeysActivity.this).show();
                 }
             }
         };
@@ -449,7 +447,6 @@ public class AddKeysActivity extends ActionBarActivity implements
 
             final ImportKeysListEntry keyEntry = new ImportKeysListEntry();
             keyEntry.setFingerprintHex(fingerprint);
-            keyEntry.setBitStrength(1337); // TODO: make optional!
             keyEntry.addOrigin(cloudPrefs.keyserver);
             ArrayList<ImportKeysListEntry> selectedEntries = new ArrayList<ImportKeysListEntry>();
             selectedEntries.add(keyEntry);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeyUpdateHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeyUpdateHelper.java
index 357a9603c..afa2e75fa 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeyUpdateHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeyUpdateHelper.java
@@ -59,7 +59,6 @@ public class KeyUpdateHelper {
                 for (String fprint : providerHelper.getAllFingerprints(KeychainContract.KeyRings.buildUnifiedKeyRingsUri())) {
                     ImportKeysListEntry key = new ImportKeysListEntry();
                     key.setFingerprintHex(fprint);
-                    key.setBitStrength(1337);
                     key.addOrigin(servers[0]);
                     keys.add(key);
                 }