more code style changes in /ui and /util

24 files changed, 345 insertions, 323 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index d2d662e40..1231b6209 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -848,7 +848,7 @@ public class EncryptActivity extends DrawerActivity {
                 new Choice(Id.choice.compression.zlib, "ZLIB ("
                         + getString(R.string.compression_fast) + ")"),
                 new Choice(Id.choice.compression.bzip2, "BZIP2 ("
-                        + getString(R.string.compression_very_slow) + ")"),};
+                        + getString(R.string.compression_very_slow) + ")"), };
         ArrayAdapter<Choice> adapter = new ArrayAdapter<Choice>(this,
                 android.R.layout.simple_spinner_item, choices);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index aa0c127cf..05bfc613e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -167,7 +167,8 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
                     query = "0x" + fingerprint;
                 }
             } else {
-                Log.e(Constants.TAG, "IMPORT_KEY_FROM_KEYSERVER action needs to contain the 'query', 'key_id', or 'fingerprint' extra!");
+                Log.e(Constants.TAG,
+                "IMPORT_KEY_FROM_KEYSERVER action needs to contain the 'query', 'key_id', or 'fingerprint' extra!");
                 return;
             }
 
@@ -336,7 +337,7 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
     // } else {
     // status.putString(
     // EXTRA_ERROR,
-    // "Scanned fingerprint does NOT match the fingerprint of the received key.  You shouldnt trust this key.");
+    // "Scanned fingerprint does NOT match the fingerprint of the received key. You shouldnt trust this key.");
     // }
     // }
     // } catch (QueryException e) {
@@ -398,7 +399,8 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
                     AppMsg.makeText(ImportKeysActivity.this, toastMessage, AppMsg.STYLE_INFO)
                             .show();
                     if (bad > 0) {
-                        BadImportKeyDialogFragment badImportKeyDialogFragment = BadImportKeyDialogFragment.newInstance(bad);
+                        BadImportKeyDialogFragment badImportKeyDialogFragment =
+                                BadImportKeyDialogFragment.newInstance(bad);
                         badImportKeyDialogFragment.show(getSupportFragmentManager(), "badKeyDialog");
                     }
                 }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
index f2449fae1..0b2fff64e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
@@ -94,7 +94,8 @@ public class ImportKeysServerFragment extends Fragment {
                 search(query, keyServer);
 
                 // close keyboard after pressing search
-                InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+                InputMethodManager imm =
+                        (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
                 imm.hideSoftInputFromWindow(mQueryEditText.getWindowToken(), 0);
             }
         });
@@ -108,7 +109,6 @@ public class ImportKeysServerFragment extends Fragment {
                     search(query, keyServer);
 
                     // Don't return true to let the keyboard close itself after pressing search
-                    // http://stackoverflow.com/questions/2342620/how-to-hide-keyboard-after-typing-in-edittext-in-android
                     return false;
                 }
                 return false;
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
index 9b3541c81..47a3fbad3 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
@@ -141,7 +141,7 @@ public class SelectSecretKeyFragment extends ListFragment implements
                         + Keys.IS_REVOKED + " = '0' AND valid_keys." + Keys.CAN_SIGN
                         + " = '1' AND valid_keys." + Keys.CREATION + " <= '" + now + "' AND "
                         + "(valid_keys." + Keys.EXPIRY + " IS NULL OR valid_keys." + Keys.EXPIRY
-                        + " >= '" + now + "')) AS " + SelectKeyCursorAdapter.PROJECTION_ROW_VALID,};
+                        + " >= '" + now + "')) AS " + SelectKeyCursorAdapter.PROJECTION_ROW_VALID, };
 
         String orderBy = UserIds.USER_ID + " ASC";
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java
index a08492aa5..02c04c11d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java
@@ -87,4 +87,4 @@ public class ViewKeyCertsFragment extends Fragment {
         startActivity(signIntent);
     }
 
-}
\ No newline at end of file
+}
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/AsyncTaskResultWrapper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/AsyncTaskResultWrapper.java
index 0285deb2e..5f2aec4fe 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/AsyncTaskResultWrapper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/AsyncTaskResultWrapper.java
@@ -27,20 +27,20 @@ package org.sufficientlysecure.keychain.ui.adapter;
  */
 public class AsyncTaskResultWrapper<T> {
 
-    private final T result;
-    private final Exception error;
+    private final T mResult;
+    private final Exception mError;
 
     public AsyncTaskResultWrapper(T result, Exception error) {
-        this.result = result;
-        this.error = error;
+        this.mResult = result;
+        this.mError = error;
     }
 
     public T getResult() {
-        return result;
+        return mResult;
     }
 
     public Exception getError() {
-        return error;
+        return mError;
     }
 
 }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index c0b6027cc..16776e121 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -40,15 +40,15 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
     protected LayoutInflater mInflater;
     protected Activity mActivity;
 
-    protected List<ImportKeysListEntry> data;
+    protected List<ImportKeysListEntry> mData;
 
     static class ViewHolder {
-        private TextView mainUserId;
-        private TextView mainUserIdRest;
-        private TextView keyId;
-        private TextView fingerprint;
-        private TextView algorithm;
-        private TextView status;
+        private TextView mMainUserId;
+        private TextView mMainUserIdRest;
+        private TextView mKeyId;
+        private TextView mFingerprint;
+        private TextView mAlgorithm;
+        private TextView mStatus;
 
     }
 
@@ -62,7 +62,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
     public void setData(List<ImportKeysListEntry> data) {
         clear();
         if (data != null) {
-            this.data = data;
+            this.mData = data;
 
             // add data to extended ArrayAdapter
             if (Build.VERSION.SDK_INT >= 11) {
@@ -76,14 +76,15 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
     }
 
     public List<ImportKeysListEntry> getData() {
-        return data;
+        return mData;
     }
 
     public ArrayList<ImportKeysListEntry> getSelectedData() {
         ArrayList<ImportKeysListEntry> selectedData = new ArrayList<ImportKeysListEntry>();
-        for (ImportKeysListEntry entry : data) {
-            if (entry.isSelected())
+        for (ImportKeysListEntry entry : mData) {
+            if (entry.isSelected()) {
                 selectedData.add(entry);
+            }
         }
         return selectedData;
     }
@@ -94,17 +95,17 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
     }
 
     public View getView(int position, View convertView, ViewGroup parent) {
-        ImportKeysListEntry entry = data.get(position);
+        ImportKeysListEntry entry = mData.get(position);
         ViewHolder holder;
         if (convertView == null) {
             holder = new ViewHolder();
             convertView = mInflater.inflate(R.layout.import_keys_list_entry, null);
-            holder.mainUserId = (TextView) convertView.findViewById(R.id.mainUserId);
-            holder.mainUserIdRest = (TextView) convertView.findViewById(R.id.mainUserIdRest);
-            holder.keyId = (TextView) convertView.findViewById(R.id.keyId);
-            holder.fingerprint = (TextView) convertView.findViewById(R.id.fingerprint);
-            holder.algorithm = (TextView) convertView.findViewById(R.id.algorithm);
-            holder.status = (TextView) convertView.findViewById(R.id.status);
+            holder.mMainUserId = (TextView) convertView.findViewById(R.id.mainUserId);
+            holder.mMainUserIdRest = (TextView) convertView.findViewById(R.id.mainUserIdRest);
+            holder.mKeyId = (TextView) convertView.findViewById(R.id.keyId);
+            holder.mFingerprint = (TextView) convertView.findViewById(R.id.fingerprint);
+            holder.mAlgorithm = (TextView) convertView.findViewById(R.id.algorithm);
+            holder.mStatus = (TextView) convertView.findViewById(R.id.status);
             convertView.setTag(holder);
         } else {
             holder = (ViewHolder) convertView.getTag();
@@ -118,36 +119,36 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
             // show red user id if it is a secret key
             if (entry.secretKey) {
                 userIdSplit[0] = mActivity.getString(R.string.secret_key) + " " + userIdSplit[0];
-                holder.mainUserId.setTextColor(Color.RED);
+                holder.mMainUserId.setTextColor(Color.RED);
             }
-            holder.mainUserId.setText(userIdSplit[0]);
+            holder.mMainUserId.setText(userIdSplit[0]);
         } else {
-            holder.mainUserId.setText(R.string.user_id_no_name);
+            holder.mMainUserId.setText(R.string.user_id_no_name);
         }
 
         // email
         if (userIdSplit[1] != null) {
-            holder.mainUserIdRest.setText(userIdSplit[1]);
-            holder.mainUserIdRest.setVisibility(View.VISIBLE);
+            holder.mMainUserIdRest.setText(userIdSplit[1]);
+            holder.mMainUserIdRest.setVisibility(View.VISIBLE);
         } else {
-            holder.mainUserIdRest.setVisibility(View.GONE);
+            holder.mMainUserIdRest.setVisibility(View.GONE);
         }
 
-        holder.keyId.setText(entry.hexKeyId);
+        holder.mKeyId.setText(entry.hexKeyId);
 
         if (entry.fingerPrint != null) {
-            holder.fingerprint.setText(mActivity.getString(R.string.fingerprint) + " " + entry.fingerPrint);
-            holder.fingerprint.setVisibility(View.VISIBLE);
+            holder.mFingerprint.setText(mActivity.getString(R.string.fingerprint) + " " + entry.fingerPrint);
+            holder.mFingerprint.setVisibility(View.VISIBLE);
         } else {
-            holder.fingerprint.setVisibility(View.GONE);
+            holder.mFingerprint.setVisibility(View.GONE);
         }
 
-        holder.algorithm.setText("" + entry.bitStrength + "/" + entry.algorithm);
+        holder.mAlgorithm.setText("" + entry.bitStrength + "/" + entry.algorithm);
 
         if (entry.revoked) {
-            holder.status.setText(R.string.revoked);
+            holder.mStatus.setText(R.string.revoked);
         } else {
-            holder.status.setVisibility(View.GONE);
+            holder.mStatus.setVisibility(View.GONE);
         }
 
         LinearLayout ll = (LinearLayout) convertView.findViewById(R.id.list);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
index fbfaa29fb..19f0d1eaf 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
@@ -45,9 +45,9 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
     public String algorithm;
     public boolean secretKey;
 
-    private boolean selected;
+    private boolean mSelected;
 
-    private byte[] bytes = new byte[]{};
+    private byte[] mBytes = new byte[]{};
 
     public ImportKeysListEntry(ImportKeysListEntry b) {
         this.userIds = b.userIds;
@@ -59,8 +59,8 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         this.bitStrength = b.bitStrength;
         this.algorithm = b.algorithm;
         this.secretKey = b.secretKey;
-        this.selected = b.selected;
-        this.bytes = b.bytes;
+        this.mSelected = b.mSelected;
+        this.mBytes = b.mBytes;
     }
 
     public int describeContents() {
@@ -78,9 +78,9 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         dest.writeInt(bitStrength);
         dest.writeString(algorithm);
         dest.writeByte((byte) (secretKey ? 1 : 0));
-        dest.writeByte((byte) (selected ? 1 : 0));
-        dest.writeInt(bytes.length);
-        dest.writeByteArray(bytes);
+        dest.writeByte((byte) (mSelected ? 1 : 0));
+        dest.writeInt(mBytes.length);
+        dest.writeByteArray(mBytes);
     }
 
     public static final Creator<ImportKeysListEntry> CREATOR = new Creator<ImportKeysListEntry>() {
@@ -96,9 +96,9 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
             vr.bitStrength = source.readInt();
             vr.algorithm = source.readString();
             vr.secretKey = source.readByte() == 1;
-            vr.selected = source.readByte() == 1;
-            vr.bytes = new byte[source.readInt()];
-            source.readByteArray(vr.bytes);
+            vr.mSelected = source.readByte() == 1;
+            vr.mBytes = new byte[source.readInt()];
+            source.readByteArray(vr.mBytes);
 
             return vr;
         }
@@ -113,11 +113,11 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
     }
 
     public byte[] getBytes() {
-        return bytes;
+        return mBytes;
     }
 
     public void setBytes(byte[] bytes) {
-        this.bytes = bytes;
+        this.mBytes = bytes;
     }
 
     /**
@@ -127,16 +127,16 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         // keys from keyserver are always public keys
         secretKey = false;
         // do not select by default
-        selected = false;
+        mSelected = false;
         userIds = new ArrayList<String>();
     }
 
     public boolean isSelected() {
-        return selected;
+        return mSelected;
     }
 
     public void setSelected(boolean selected) {
-        this.selected = selected;
+        this.mSelected = selected;
     }
 
     /**
@@ -146,13 +146,13 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
     public ImportKeysListEntry(PGPKeyRing pgpKeyRing) {
         // save actual key object into entry, used to import it later
         try {
-            this.bytes = pgpKeyRing.getEncoded();
+            this.mBytes = pgpKeyRing.getEncoded();
         } catch (IOException e) {
             Log.e(Constants.TAG, "IOException on pgpKeyRing.getEncoded()", e);
         }
 
         // selected is default
-        this.selected = true;
+        this.mSelected = true;
 
         if (pgpKeyRing instanceof PGPSecretKeyRing) {
             secretKey = true;
@@ -187,4 +187,4 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
             this.algorithm = "unknown";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
index d7544d1bb..c9983213c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
@@ -31,21 +31,22 @@ import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
 
-public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>> {
+public class ImportKeysListLoader
+        extends AsyncTaskLoader<AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>> {
 
     public static class FileHasNoContent extends Exception {
 
     }
 
     public static class NonPgpPart extends Exception {
-        private int count;
+        private int mCount;
 
         public NonPgpPart(int count) {
-            this.count = count;
+            this.mCount = count;
         }
 
         public int getCount() {
-            return count;
+            return mCount;
         }
     }
 
@@ -53,8 +54,8 @@ public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper
 
     InputData mInputData;
 
-    ArrayList<ImportKeysListEntry> data = new ArrayList<ImportKeysListEntry>();
-    AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>> entryListWrapper;
+    ArrayList<ImportKeysListEntry> mData = new ArrayList<ImportKeysListEntry>();
+    AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>> mEntryListWrapper;
 
     public ImportKeysListLoader(Context context, InputData inputData) {
         super(context);
@@ -65,16 +66,16 @@ public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper
     @Override
     public AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>> loadInBackground() {
 
-        entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(data, null);
+        mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mData, null);
 
         if (mInputData == null) {
             Log.e(Constants.TAG, "Input data is null!");
-            return entryListWrapper;
+            return mEntryListWrapper;
         }
 
         generateListOfKeyrings(mInputData);
 
-        return entryListWrapper;
+        return mEntryListWrapper;
     }
 
     @Override
@@ -142,25 +143,25 @@ public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper
             }
         } catch (Exception e) {
             Log.e(Constants.TAG, "Exception on parsing key file!", e);
-            entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(data, e);
+            mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mData, e);
             nonPgpCounter = 0;
         }
 
         if (isEmpty) {
             Log.e(Constants.TAG, "File has no content!", new FileHasNoContent());
-            entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>
-                    (data, new FileHasNoContent());
+            mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>
+                    (mData, new FileHasNoContent());
         }
 
         if (nonPgpCounter > 0) {
-            entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>
-                    (data, new NonPgpPart(nonPgpCounter));
+            mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>
+                    (mData, new NonPgpPart(nonPgpCounter));
         }
     }
 
     private void addToData(PGPKeyRing keyring) {
         ImportKeysListEntry item = new ImportKeysListEntry(keyring);
-        data.add(item);
+        mData.add(item);
     }
 
 }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
index 0e1b83c81..1e96606a6 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
@@ -26,14 +26,15 @@ import org.sufficientlysecure.keychain.util.Log;
 
 import java.util.ArrayList;
 
-public class ImportKeysListServerLoader extends AsyncTaskLoader<AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>> {
+public class ImportKeysListServerLoader
+        extends AsyncTaskLoader<AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>> {
     Context mContext;
 
     String mServerQuery;
     String mKeyServer;
 
-    private ArrayList<ImportKeysListEntry> entryList = new ArrayList<ImportKeysListEntry>();
-    private AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>> entryListWrapper;
+    private ArrayList<ImportKeysListEntry> mEntryList = new ArrayList<ImportKeysListEntry>();
+    private AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>> mEntryListWrapper;
 
     public ImportKeysListServerLoader(Context context, String serverQuery, String keyServer) {
         super(context);
@@ -45,16 +46,16 @@ public class ImportKeysListServerLoader extends AsyncTaskLoader<AsyncTaskResultW
     @Override
     public AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>> loadInBackground() {
 
-        entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(entryList, null);
+        mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, null);
 
         if (mServerQuery == null) {
             Log.e(Constants.TAG, "mServerQuery is null!");
-            return entryListWrapper;
+            return mEntryListWrapper;
         }
 
         queryServer(mServerQuery, mKeyServer);
 
-        return entryListWrapper;
+        return mEntryListWrapper;
     }
 
     @Override
@@ -89,17 +90,17 @@ public class ImportKeysListServerLoader extends AsyncTaskLoader<AsyncTaskResultW
             ArrayList<ImportKeysListEntry> searchResult = server.search(query);
 
             // add result to data
-            entryList.addAll(searchResult);
-            entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(entryList, null);
+            mEntryList.addAll(searchResult);
+            mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, null);
         } catch (KeyServer.InsufficientQuery e) {
             Log.e(Constants.TAG, "InsufficientQuery", e);
-            entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(entryList, e);
+            mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);
         } catch (KeyServer.QueryException e) {
             Log.e(Constants.TAG, "QueryException", e);
-            entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(entryList, e);
+            mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);
         } catch (KeyServer.TooManyResponses e) {
             Log.e(Constants.TAG, "TooManyResponses", e);
-            entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(entryList, e);
+            mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, e);
         }
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
index 0a1dca751..c997599bd 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
@@ -94,4 +94,4 @@ public class KeyValueSpinnerAdapter extends ArrayAdapter<String> {
         }
         return -1;
     }
-}
\ No newline at end of file
+}
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
index eaaa54376..beb76fc10 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
@@ -44,8 +44,8 @@ public class SelectKeyCursorAdapter extends HighlightQueryCursorAdapter {
     private int mIndexProjectionValid;
     private int mIndexProjectionAvailable;
 
-    public final static String PROJECTION_ROW_AVAILABLE = "available";
-    public final static String PROJECTION_ROW_VALID = "valid";
+    public static final String PROJECTION_ROW_AVAILABLE = "available";
+    public static final String PROJECTION_ROW_VALID = "valid";
 
     public SelectKeyCursorAdapter(Context context, Cursor c, int flags, ListView listView,
                                   int keyType) {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/TabsAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/TabsAdapter.java
index 924a70897..f435d46ef 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/TabsAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/TabsAdapter.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2012-2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package org.sufficientlysecure.keychain.ui.adapter;
 
 import android.content.Context;
@@ -19,12 +36,12 @@ public class TabsAdapter extends FragmentStatePagerAdapter implements ActionBar.
     private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
 
     static final class TabInfo {
-        private final Class<?> clss;
-        private final Bundle args;
+        private final Class<?> mClss;
+        private final Bundle mArgs;
 
-        TabInfo(Class<?> _class, Bundle _args) {
-            clss = _class;
-            args = _args;
+        TabInfo(Class<?> mClss, Bundle mArgs) {
+            this.mClss = mClss;
+            this.mArgs = mArgs;
         }
     }
 
@@ -54,7 +71,7 @@ public class TabsAdapter extends FragmentStatePagerAdapter implements ActionBar.
     @Override
     public Fragment getItem(int position) {
         TabInfo info = mTabs.get(position);
-        return Fragment.instantiate(mContext, info.clss.getName(), info.args);
+        return Fragment.instantiate(mContext, info.mClss.getName(), info.mArgs);
     }
 
     public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
@@ -81,4 +98,4 @@ public class TabsAdapter extends FragmentStatePagerAdapter implements ActionBar.
 
     public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
     }
-}
\ No newline at end of file
+}
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
index d3c37edc6..d2f4cc003 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java
@@ -17,13 +17,14 @@
 
 package org.sufficientlysecure.keychain.util;
 
-import java.util.HashMap;
+import android.annotation.SuppressLint;
+import android.app.Activity;
 import org.spongycastle.bcpg.HashAlgorithmTags;
 import org.spongycastle.openpgp.PGPEncryptedData;
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
-import android.annotation.SuppressLint;
-import android.app.Activity;
+
+import java.util.HashMap;
 
 @SuppressLint("UseSparseArrays")
 public class AlgorithmNames {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java
index 9e0042c00..1a6184d9c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java
@@ -39,7 +39,7 @@ public class Choice {
     }
 
     @Override
-	public String toString() {
+    public String toString() {
         return mName;
     }
 }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
index 99cac1152..c94917b60 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
@@ -85,25 +85,25 @@ public class HkpKeyServer extends KeyServer {
     public static Pattern USER_ID_LINE = Pattern.compile("^   +(.+)$", Pattern.MULTILINE
             | Pattern.CASE_INSENSITIVE);
 
-	private static final short PORT_DEFAULT = 11371;
+    private static final short PORT_DEFAULT = 11371;
 
-	/**
-	 * @param hostAndPort may be just "<code>hostname</code>" (eg. "<code>pool.sks-keyservers.net</code>"), then it will
-	 *                connect using {@link #PORT_DEFAULT}. However, port may be specified after colon
-	 *                ("<code>hostname:port</code>", eg. "<code>p80.pool.sks-keyservers.net:80</code>").
-	 */
-	public HkpKeyServer(String hostAndPort) {
-		String host = hostAndPort;
-		short port = PORT_DEFAULT;
-		final int colonPosition = hostAndPort.lastIndexOf(':');
-		if (colonPosition > 0) {
-			host = hostAndPort.substring(0, colonPosition);
-			final String portStr = hostAndPort.substring(colonPosition + 1);
-			port = Short.decode(portStr);
-		}
-		mHost = host;
-		mPort = port;
-	}
+    /**
+     * @param hostAndPort may be just "<code>hostname</code>" (eg. "<code>pool.sks-keyservers.net</code>"), then it will
+     *                    connect using {@link #PORT_DEFAULT}. However, port may be specified after colon
+     *                    ("<code>hostname:port</code>", eg. "<code>p80.pool.sks-keyservers.net:80</code>").
+     */
+    public HkpKeyServer(String hostAndPort) {
+        String host = hostAndPort;
+        short port = PORT_DEFAULT;
+        final int colonPosition = hostAndPort.lastIndexOf(':');
+        if (colonPosition > 0) {
+            host = hostAndPort.substring(0, colonPosition);
+            final String portStr = hostAndPort.substring(colonPosition + 1);
+            port = Short.decode(portStr);
+        }
+        mHost = host;
+        mPort = port;
+    }
 
     public HkpKeyServer(String host, short port) {
         mHost = host;
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
index a43c03e3e..b95b3ee6a 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
@@ -18,30 +18,28 @@ package org.sufficientlysecure.keychain.util;
 
 import android.content.Intent;
 import android.support.v4.app.Fragment;
-
 import com.google.zxing.integration.android.IntentIntegrator;
 
 /**
  * IntentIntegrator for the V4 Android compatibility package.
- * 
+ *
  * @author Lachezar Dobrev
  */
 public final class IntentIntegratorSupportV4 extends IntentIntegrator {
 
-    private final Fragment fragment;
+    private final Fragment mFragment;
 
     /**
-     * @param fragment
-     *            Fragment to handle activity response.
+     * @param fragment Fragment to handle activity response.
      */
     public IntentIntegratorSupportV4(Fragment fragment) {
         super(fragment.getActivity());
-        this.fragment = fragment;
+        this.mFragment = fragment;
     }
 
     @Override
     protected void startActivityForResult(Intent intent, int code) {
-        fragment.startActivityForResult(intent, code);
+        mFragment.startActivityForResult(intent, code);
     }
 
 }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java
index 7049820e8..a31fdc5ae 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java
@@ -18,12 +18,12 @@
 
 package org.sufficientlysecure.keychain.util;
 
-import java.util.List;
-
 import org.sufficientlysecure.keychain.ui.adapter.ImportKeysListEntry;
 
+import java.util.List;
+
 public abstract class KeyServer {
-    static public class QueryException extends Exception {
+    public static class QueryException extends Exception {
         private static final long serialVersionUID = 2703768928624654512L;
 
         public QueryException(String message) {
@@ -31,15 +31,15 @@ public abstract class KeyServer {
         }
     }
 
-    static public class TooManyResponses extends Exception {
+    public static class TooManyResponses extends Exception {
         private static final long serialVersionUID = 2703768928624654513L;
     }
 
-    static public class InsufficientQuery extends Exception {
+    public static class InsufficientQuery extends Exception {
         private static final long serialVersionUID = 2703768928624654514L;
     }
 
-    static public class AddKeyException extends Exception {
+    public static class AddKeyException extends Exception {
         private static final long serialVersionUID = -507574859137295530L;
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeychainServiceListener.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeychainServiceListener.java
index 0d7513057..14b2a2211 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeychainServiceListener.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeychainServiceListener.java
@@ -1,3 +1,16 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.sufficientlysecure.keychain.util;
 
 public interface KeychainServiceListener {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java
index bcf275c32..f58f1757a 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java
@@ -21,7 +21,6 @@ import org.sufficientlysecure.keychain.Constants;
 
 /**
  * Wraps Android Logging to enable or disable debug output using Constants
- * 
  */
 public final class Log {
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
index 530a81044..2d8fbcd81 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java
@@ -14,48 +14,36 @@ import android.os.Build;
 import android.os.Process;
 import android.util.Log;
 
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
-import java.security.SecureRandom;
-import java.security.SecureRandomSpi;
-import java.security.Security;
+import java.io.*;
+import java.security.*;
 
 /**
  * Fixes for the output of the default PRNG having low entropy.
- * 
+ * <p/>
  * The fixes need to be applied via {@link #apply()} before any use of Java Cryptography
  * Architecture primitives. A good place to invoke them is in the application's {@code onCreate}.
- * 
+ * <p/>
  * copied from http://android-developers.blogspot.de/2013/08/some-securerandom-thoughts.html
- * 
- * 
+ * <p/>
+ * <p/>
  * More information on these Android bugs:
  * http://blog.k3170makan.com/2013/08/more-details-on-android-jca-prng-flaw.html
  * Paper: "Randomly failed! Weaknesses in Java Pseudo Random Number Generators (PRNGs)"
- * 
- * 
+ * <p/>
+ * <p/>
  * Sep 15, 2013:
  * On some devices /dev/urandom is non-writable!
  * No need to seed /dev/urandom. urandom should have enough seeds from the OS and kernel.
  * Only OpenSSL seeds are broken. See http://emboss.github.io/blog/2013/08/21/openssl-prng-is-not-really-fork-safe
- * 
+ * <p/>
  * see also:
  * https://github.com/k9mail/k-9/commit/dda8f64276d4d29c43f86237cd77819c28f22f21
  * In addition to a couple of custom ROMs linking /dev/urandom to a non-writable
  * random version, now Samsung's SELinux policy also prevents apps from opening
  * /dev/urandom for writing. Since we shouldn't need to write to /dev/urandom anyway
  * we now simply don't.
- *
- *
+ * <p/>
+ * <p/>
  * Sep 17, 2013:
  * Updated from official blogpost:
  * Update: the original code sample below crashed on a small fraction of Android
@@ -66,10 +54,13 @@ public final class PRNGFixes {
     private static final int VERSION_CODE_JELLY_BEAN = 16;
     private static final int VERSION_CODE_JELLY_BEAN_MR2 = 18;
     private static final byte[] BUILD_FINGERPRINT_AND_DEVICE_SERIAL =
-        getBuildFingerprintAndDeviceSerial();
+            getBuildFingerprintAndDeviceSerial();
 
-    /** Hidden constructor to prevent instantiation. */
-    private PRNGFixes() {}
+    /**
+     * Hidden constructor to prevent instantiation.
+     */
+    private PRNGFixes() {
+    }
 
     /**
      * Applies all fixes.
@@ -136,7 +127,7 @@ public final class PRNGFixes {
         if ((secureRandomProviders == null)
                 || (secureRandomProviders.length < 1)
                 || (!LinuxPRNGSecureRandomProvider.class.equals(
-                        secureRandomProviders[0].getClass()))) {
+                secureRandomProviders[0].getClass()))) {
             Security.insertProviderAt(new LinuxPRNGSecureRandomProvider(), 1);
         }
 
@@ -161,7 +152,7 @@ public final class PRNGFixes {
                 rng2.getProvider().getClass())) {
             throw new SecurityException(
                     "SecureRandom.getInstance(\"SHA1PRNG\") backed by wrong"
-                    + " Provider: " + rng2.getProvider().getClass());
+                            + " Provider: " + rng2.getProvider().getClass());
         }
     }
 
@@ -175,7 +166,7 @@ public final class PRNGFixes {
             super("LinuxPRNG",
                     1.0,
                     "A Linux-specific random number provider that uses"
-                        + " /dev/urandom");
+                            + " /dev/urandom");
             // Although /dev/urandom is not a SHA-1 PRNG, some apps
             // explicitly request a SHA1PRNG SecureRandom and we thus need to
             // prevent them from getting the default implementation whose output
@@ -358,4 +349,4 @@ public final class PRNGFixes {
             throw new RuntimeException("UTF-8 encoding not supported");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
index aa21581c6..377a8d5d6 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java
@@ -17,11 +17,7 @@
 
 package org.sufficientlysecure.keychain.util;
 
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -32,59 +28,63 @@ import java.util.concurrent.locks.ReentrantLock;
 public class PausableThreadPoolExecutor extends ThreadPoolExecutor {
 
     public PausableThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime,
-            TimeUnit unit, BlockingQueue<Runnable> workQueue, RejectedExecutionHandler handler) {
+                                      TimeUnit unit, BlockingQueue<Runnable> workQueue,
+                                      RejectedExecutionHandler handler) {
         super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, handler);
     }
 
     public PausableThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime,
-            TimeUnit unit, BlockingQueue<Runnable> workQueue, ThreadFactory threadFactory,
-            RejectedExecutionHandler handler) {
+                                      TimeUnit unit, BlockingQueue<Runnable> workQueue,
+                                      ThreadFactory threadFactory,
+                                      RejectedExecutionHandler handler) {
         super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, handler);
     }
 
     public PausableThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime,
-            TimeUnit unit, BlockingQueue<Runnable> workQueue, ThreadFactory threadFactory) {
+                                      TimeUnit unit, BlockingQueue<Runnable> workQueue,
+                                      ThreadFactory threadFactory) {
         super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory);
     }
 
     public PausableThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime,
-            TimeUnit unit, BlockingQueue<Runnable> workQueue) {
+                                      TimeUnit unit, BlockingQueue<Runnable> workQueue) {
         super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue);
     }
 
-    private boolean isPaused;
-    private ReentrantLock pauseLock = new ReentrantLock();
-    private Condition unpaused = pauseLock.newCondition();
+    private boolean mIsPaused;
+    private ReentrantLock mPauseLock = new ReentrantLock();
+    private Condition mUnPaused = mPauseLock.newCondition();
 
     protected void beforeExecute(Thread t, Runnable r) {
         super.beforeExecute(t, r);
-        pauseLock.lock();
+        mPauseLock.lock();
         try {
-            while (isPaused)
-                unpaused.await();
+            while (mIsPaused) {
+                mUnPaused.await();
+            }
         } catch (InterruptedException ie) {
             t.interrupt();
         } finally {
-            pauseLock.unlock();
+            mPauseLock.unlock();
         }
     }
 
     public void pause() {
-        pauseLock.lock();
+        mPauseLock.lock();
         try {
-            isPaused = true;
+            mIsPaused = true;
         } finally {
-            pauseLock.unlock();
+            mPauseLock.unlock();
         }
     }
 
     public void resume() {
-        pauseLock.lock();
+        mPauseLock.lock();
         try {
-            isPaused = false;
-            unpaused.signalAll();
+            mIsPaused = false;
+            mUnPaused.signalAll();
         } finally {
-            pauseLock.unlock();
+            mPauseLock.unlock();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java
index f503227a3..28a12bf37 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java
@@ -25,147 +25,147 @@ public final class Primes {
     // taken from http://www.ietf.org/rfc/rfc3526.txt
     public static final String P1536 =
             "FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +
-            "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" +
-            "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" +
-            "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" +
-            "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" +
-            "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" +
-            "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" +
-            "670C354E 4ABC9804 F1746C08 CA237327 FFFFFFFF FFFFFFFF";
+                    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" +
+                    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" +
+                    "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" +
+                    "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" +
+                    "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" +
+                    "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" +
+                    "670C354E 4ABC9804 F1746C08 CA237327 FFFFFFFF FFFFFFFF";
 
     public static final String P2048 =
             "FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +
-            "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" +
-            "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" +
-            "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" +
-            "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" +
-            "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" +
-            "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" +
-            "670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B" +
-            "E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9" +
-            "DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510" +
-            "15728E5A 8AACAA68 FFFFFFFF FFFFFFFF";
+                    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" +
+                    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" +
+                    "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" +
+                    "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" +
+                    "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" +
+                    "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" +
+                    "670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B" +
+                    "E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9" +
+                    "DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510" +
+                    "15728E5A 8AACAA68 FFFFFFFF FFFFFFFF";
 
     public static final String P3072 =
             "FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +
-            "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" +
-            "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" +
-            "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" +
-            "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" +
-            "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" +
-            "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" +
-            "670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B" +
-            "E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9" +
-            "DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510" +
-            "15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64" +
-            "ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7" +
-            "ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B" +
-            "F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C" +
-            "BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31" +
-            "43DB5BFC E0FD108E 4B82D120 A93AD2CA FFFFFFFF FFFFFFFF";
+                    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" +
+                    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" +
+                    "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" +
+                    "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" +
+                    "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" +
+                    "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" +
+                    "670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B" +
+                    "E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9" +
+                    "DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510" +
+                    "15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64" +
+                    "ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7" +
+                    "ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B" +
+                    "F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C" +
+                    "BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31" +
+                    "43DB5BFC E0FD108E 4B82D120 A93AD2CA FFFFFFFF FFFFFFFF";
 
     public static final String P4096 =
             "FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +
-            "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" +
-            "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" +
-            "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" +
-            "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" +
-            "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" +
-            "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" +
-            "670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B" +
-            "E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9" +
-            "DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510" +
-            "15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64" +
-            "ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7" +
-            "ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B" +
-            "F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C" +
-            "BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31" +
-            "43DB5BFC E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7" +
-            "88719A10 BDBA5B26 99C32718 6AF4E23C 1A946834 B6150BDA" +
-            "2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6" +
-            "287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED" +
-            "1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9" +
-            "93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34063199" +
-            "FFFFFFFF FFFFFFFF";
+                    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" +
+                    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" +
+                    "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" +
+                    "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" +
+                    "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" +
+                    "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" +
+                    "670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B" +
+                    "E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9" +
+                    "DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510" +
+                    "15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64" +
+                    "ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7" +
+                    "ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B" +
+                    "F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C" +
+                    "BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31" +
+                    "43DB5BFC E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7" +
+                    "88719A10 BDBA5B26 99C32718 6AF4E23C 1A946834 B6150BDA" +
+                    "2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6" +
+                    "287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED" +
+                    "1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9" +
+                    "93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34063199" +
+                    "FFFFFFFF FFFFFFFF";
 
     public static final String P6144 =
             "FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +
-            "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" +
-            "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" +
-            "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" +
-            "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" +
-            "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" +
-            "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" +
-            "670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B" +
-            "E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9" +
-            "DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510" +
-            "15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64" +
-            "ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7" +
-            "ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B" +
-            "F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C" +
-            "BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31" +
-            "43DB5BFC E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7" +
-            "88719A10 BDBA5B26 99C32718 6AF4E23C 1A946834 B6150BDA" +
-            "2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6" +
-            "287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED" +
-            "1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9" +
-            "93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34028492" +
-            "36C3FAB4 D27C7026 C1D4DCB2 602646DE C9751E76 3DBA37BD" +
-            "F8FF9406 AD9E530E E5DB382F 413001AE B06A53ED 9027D831" +
-            "179727B0 865A8918 DA3EDBEB CF9B14ED 44CE6CBA CED4BB1B" +
-            "DB7F1447 E6CC254B 33205151 2BD7AF42 6FB8F401 378CD2BF" +
-            "5983CA01 C64B92EC F032EA15 D1721D03 F482D7CE 6E74FEF6" +
-            "D55E702F 46980C82 B5A84031 900B1C9E 59E7C97F BEC7E8F3" +
-            "23A97A7E 36CC88BE 0F1D45B7 FF585AC5 4BD407B2 2B4154AA" +
-            "CC8F6D7E BF48E1D8 14CC5ED2 0F8037E0 A79715EE F29BE328" +
-            "06A1D58B B7C5DA76 F550AA3D 8A1FBFF0 EB19CCB1 A313D55C" +
-            "DA56C9EC 2EF29632 387FE8D7 6E3C0468 043E8F66 3F4860EE" +
-            "12BF2D5B 0B7474D6 E694F91E 6DCC4024 FFFFFFFF FFFFFFFF";
+                    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" +
+                    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" +
+                    "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" +
+                    "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" +
+                    "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" +
+                    "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" +
+                    "670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B" +
+                    "E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9" +
+                    "DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510" +
+                    "15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64" +
+                    "ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7" +
+                    "ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B" +
+                    "F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C" +
+                    "BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31" +
+                    "43DB5BFC E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7" +
+                    "88719A10 BDBA5B26 99C32718 6AF4E23C 1A946834 B6150BDA" +
+                    "2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6" +
+                    "287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED" +
+                    "1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9" +
+                    "93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34028492" +
+                    "36C3FAB4 D27C7026 C1D4DCB2 602646DE C9751E76 3DBA37BD" +
+                    "F8FF9406 AD9E530E E5DB382F 413001AE B06A53ED 9027D831" +
+                    "179727B0 865A8918 DA3EDBEB CF9B14ED 44CE6CBA CED4BB1B" +
+                    "DB7F1447 E6CC254B 33205151 2BD7AF42 6FB8F401 378CD2BF" +
+                    "5983CA01 C64B92EC F032EA15 D1721D03 F482D7CE 6E74FEF6" +
+                    "D55E702F 46980C82 B5A84031 900B1C9E 59E7C97F BEC7E8F3" +
+                    "23A97A7E 36CC88BE 0F1D45B7 FF585AC5 4BD407B2 2B4154AA" +
+                    "CC8F6D7E BF48E1D8 14CC5ED2 0F8037E0 A79715EE F29BE328" +
+                    "06A1D58B B7C5DA76 F550AA3D 8A1FBFF0 EB19CCB1 A313D55C" +
+                    "DA56C9EC 2EF29632 387FE8D7 6E3C0468 043E8F66 3F4860EE" +
+                    "12BF2D5B 0B7474D6 E694F91E 6DCC4024 FFFFFFFF FFFFFFFF";
 
     public static final String P8192 =
             "FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +
-            "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" +
-            "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" +
-            "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" +
-            "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" +
-            "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" +
-            "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" +
-            "670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B" +
-            "E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9" +
-            "DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510" +
-            "15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64" +
-            "ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7" +
-            "ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B" +
-            "F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C" +
-            "BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31" +
-            "43DB5BFC E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7" +
-            "88719A10 BDBA5B26 99C32718 6AF4E23C 1A946834 B6150BDA" +
-            "2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6" +
-            "287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED" +
-            "1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9" +
-            "93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34028492" +
-            "36C3FAB4 D27C7026 C1D4DCB2 602646DE C9751E76 3DBA37BD" +
-            "F8FF9406 AD9E530E E5DB382F 413001AE B06A53ED 9027D831" +
-            "179727B0 865A8918 DA3EDBEB CF9B14ED 44CE6CBA CED4BB1B" +
-            "DB7F1447 E6CC254B 33205151 2BD7AF42 6FB8F401 378CD2BF" +
-            "5983CA01 C64B92EC F032EA15 D1721D03 F482D7CE 6E74FEF6" +
-            "D55E702F 46980C82 B5A84031 900B1C9E 59E7C97F BEC7E8F3" +
-            "23A97A7E 36CC88BE 0F1D45B7 FF585AC5 4BD407B2 2B4154AA" +
-            "CC8F6D7E BF48E1D8 14CC5ED2 0F8037E0 A79715EE F29BE328" +
-            "06A1D58B B7C5DA76 F550AA3D 8A1FBFF0 EB19CCB1 A313D55C" +
-            "DA56C9EC 2EF29632 387FE8D7 6E3C0468 043E8F66 3F4860EE" +
-            "12BF2D5B 0B7474D6 E694F91E 6DBE1159 74A3926F 12FEE5E4" +
-            "38777CB6 A932DF8C D8BEC4D0 73B931BA 3BC832B6 8D9DD300" +
-            "741FA7BF 8AFC47ED 2576F693 6BA42466 3AAB639C 5AE4F568" +
-            "3423B474 2BF1C978 238F16CB E39D652D E3FDB8BE FC848AD9" +
-            "22222E04 A4037C07 13EB57A8 1A23F0C7 3473FC64 6CEA306B" +
-            "4BCBC886 2F8385DD FA9D4B7F A2C087E8 79683303 ED5BDD3A" +
-            "062B3CF5 B3A278A6 6D2A13F8 3F44F82D DF310EE0 74AB6A36" +
-            "4597E899 A0255DC1 64F31CC5 0846851D F9AB4819 5DED7EA1" +
-            "B1D510BD 7EE74D73 FAF36BC3 1ECFA268 359046F4 EB879F92" +
-            "4009438B 481C6CD7 889A002E D5EE382B C9190DA6 FC026E47" +
-            "9558E447 5677E9AA 9E3050E2 765694DF C81F56E8 80B96E71" +
-            "60C980DD 98EDD3DF FFFFFFFF FFFFFFFF";
+                    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" +
+                    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245" +
+                    "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED" +
+                    "EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D" +
+                    "C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F" +
+                    "83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" +
+                    "670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B" +
+                    "E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9" +
+                    "DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510" +
+                    "15728E5A 8AAAC42D AD33170D 04507A33 A85521AB DF1CBA64" +
+                    "ECFB8504 58DBEF0A 8AEA7157 5D060C7D B3970F85 A6E1E4C7" +
+                    "ABF5AE8C DB0933D7 1E8C94E0 4A25619D CEE3D226 1AD2EE6B" +
+                    "F12FFA06 D98A0864 D8760273 3EC86A64 521F2B18 177B200C" +
+                    "BBE11757 7A615D6C 770988C0 BAD946E2 08E24FA0 74E5AB31" +
+                    "43DB5BFC E0FD108E 4B82D120 A9210801 1A723C12 A787E6D7" +
+                    "88719A10 BDBA5B26 99C32718 6AF4E23C 1A946834 B6150BDA" +
+                    "2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6" +
+                    "287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED" +
+                    "1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9" +
+                    "93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34028492" +
+                    "36C3FAB4 D27C7026 C1D4DCB2 602646DE C9751E76 3DBA37BD" +
+                    "F8FF9406 AD9E530E E5DB382F 413001AE B06A53ED 9027D831" +
+                    "179727B0 865A8918 DA3EDBEB CF9B14ED 44CE6CBA CED4BB1B" +
+                    "DB7F1447 E6CC254B 33205151 2BD7AF42 6FB8F401 378CD2BF" +
+                    "5983CA01 C64B92EC F032EA15 D1721D03 F482D7CE 6E74FEF6" +
+                    "D55E702F 46980C82 B5A84031 900B1C9E 59E7C97F BEC7E8F3" +
+                    "23A97A7E 36CC88BE 0F1D45B7 FF585AC5 4BD407B2 2B4154AA" +
+                    "CC8F6D7E BF48E1D8 14CC5ED2 0F8037E0 A79715EE F29BE328" +
+                    "06A1D58B B7C5DA76 F550AA3D 8A1FBFF0 EB19CCB1 A313D55C" +
+                    "DA56C9EC 2EF29632 387FE8D7 6E3C0468 043E8F66 3F4860EE" +
+                    "12BF2D5B 0B7474D6 E694F91E 6DBE1159 74A3926F 12FEE5E4" +
+                    "38777CB6 A932DF8C D8BEC4D0 73B931BA 3BC832B6 8D9DD300" +
+                    "741FA7BF 8AFC47ED 2576F693 6BA42466 3AAB639C 5AE4F568" +
+                    "3423B474 2BF1C978 238F16CB E39D652D E3FDB8BE FC848AD9" +
+                    "22222E04 A4037C07 13EB57A8 1A23F0C7 3473FC64 6CEA306B" +
+                    "4BCBC886 2F8385DD FA9D4B7F A2C087E8 79683303 ED5BDD3A" +
+                    "062B3CF5 B3A278A6 6D2A13F8 3F44F82D DF310EE0 74AB6A36" +
+                    "4597E899 A0255DC1 64F31CC5 0846851D F9AB4819 5DED7EA1" +
+                    "B1D510BD 7EE74D73 FAF36BC3 1ECFA268 359046F4 EB879F92" +
+                    "4009438B 481C6CD7 889A002E D5EE382B C9190DA6 FC026E47" +
+                    "9558E447 5677E9AA 9E3050E2 765694DF C81F56E8 80B96E71" +
+                    "60C980DD 98EDD3DF FFFFFFFF FFFFFFFF";
 
     public static BigInteger getBestPrime(int keySize) {
         String primeString;
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
index 9e8118e7a..8c3367bea 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java
@@ -18,26 +18,24 @@
 
 package org.sufficientlysecure.keychain.util;
 
-import java.util.Hashtable;
-
-import org.sufficientlysecure.keychain.Constants;
-
 import android.graphics.Bitmap;
 import android.graphics.Color;
-
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import org.sufficientlysecure.keychain.Constants;
+
+import java.util.Hashtable;
 
 public class QrCodeUtils {
-    public final static QRCodeWriter QR_CODE_WRITER = new QRCodeWriter();
+    public static final QRCodeWriter QR_CODE_WRITER = new QRCodeWriter();
 
     /**
      * Generate Bitmap with QR Code based on input.
-     * 
+     *
      * @param input
      * @param size
      * @return QR Code as Bitmap