Removing remaining uses of Id, closing one of the oldest bugs #9

3 files changed, 5 insertions, 7 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AccountSettings.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AccountSettings.java
index 7e9b1ae4a..a25ecded6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AccountSettings.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AccountSettings.java
@@ -19,11 +19,11 @@ package org.sufficientlysecure.keychain.remote;
 
 import org.spongycastle.bcpg.HashAlgorithmTags;
 import org.spongycastle.openpgp.PGPEncryptedData;
-import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.Constants;
 
 public class AccountSettings {
     private String mAccountName;
-    private long mKeyId = Id.key.none;
+    private long mKeyId = Constants.key.none;
     private int mEncryptionAlgorithm;
     private int mHashAlgorithm;
     private int mCompression;
@@ -39,7 +39,7 @@ public class AccountSettings {
         // defaults:
         this.mEncryptionAlgorithm = PGPEncryptedData.AES_256;
         this.mHashAlgorithm = HashAlgorithmTags.SHA512;
-        this.mCompression = Id.choice.compression.zlib;
+        this.mCompression = Constants.choice.compression.zlib;
     }
 
     public String getAccountName() {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index 049a47159..2371d5057 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -30,7 +30,6 @@ import org.openintents.openpgp.OpenPgpSignatureResult;
 import org.openintents.openpgp.util.OpenPgpApi;
 import org.spongycastle.util.Arrays;
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.pgp.PgpDecryptVerify;
 import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyResult;
 import org.sufficientlysecure.keychain.pgp.PgpHelper;
@@ -269,7 +268,7 @@ public class OpenPgpService extends RemoteService {
                             .signaturePassphrase(passphrase);
                 } else {
                     // encrypt only
-                    builder.signatureMasterKeyId(Id.key.none);
+                    builder.signatureMasterKeyId(Constants.key.none);
                 }
                 // execute PGP operation!
                 builder.build().execute();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
index dddd92979..2fd1ad3b5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
@@ -27,7 +27,6 @@ import android.view.View;
 import org.openintents.openpgp.util.OpenPgpApi;
 import org.sufficientlysecure.htmltextview.HtmlTextView;
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.ActionBarHelper;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
@@ -142,7 +141,7 @@ public class RemoteServiceActivity extends ActionBarActivity {
                             // Save
 
                             // user needs to select a key!
-                            if (mAccSettingsFragment.getAccSettings().getKeyId() == Id.key.none) {
+                            if (mAccSettingsFragment.getAccSettings().getKeyId() == Constants.key.none) {
                                 mAccSettingsFragment.setErrorOnSelectKeyFragment(
                                         getString(R.string.api_register_error_select_key));
                             } else {