more UI code style fixes

4 files changed, 31 insertions, 31 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
index 6245fd95c..da29f808a 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java
@@ -52,4 +52,4 @@ public class FixedListView extends ListView {
         super.onMeasure(widthMeasureSpec, expandSpec);
     }
 
-}
\ No newline at end of file
+}
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
index 0d15de982..7e0acfa28 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
@@ -54,7 +54,8 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
     GregorianCalendar mExpiryDate;
 
     private int mDatePickerResultCount = 0;
-    private DatePickerDialog.OnDateSetListener mExpiryDateSetListener = new DatePickerDialog.OnDateSetListener() {
+    private DatePickerDialog.OnDateSetListener mExpiryDateSetListener =
+            new DatePickerDialog.OnDateSetListener() {
         public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
             // Note: Ignore results after the first one - android sends multiples.
             if (mDatePickerResultCount++ == 0) {
@@ -89,7 +90,7 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
                 new Choice(Id.choice.usage.encrypt_only, getResources().getString(
                         R.string.choice_encrypt_only)),
                 new Choice(Id.choice.usage.sign_and_encrypt, getResources().getString(
-                        R.string.choice_sign_and_encrypt)),};
+                        R.string.choice_sign_and_encrypt)), };
         ArrayAdapter<Choice> adapter = new ArrayAdapter<Choice>(getContext(),
                 android.R.layout.simple_spinner_item, choices);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -129,13 +130,15 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
                         });
 
                 // setCalendarViewShown() is supported from API 11 onwards.
-                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB)
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
                     // Hide calendarView in tablets because of the unix warparound bug.
                     dialog.getDatePicker().setCalendarViewShown(false);
-
+                }
                 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
                     if (dialog != null && mCreatedDate != null) {
-                        dialog.getDatePicker().setMinDate(mCreatedDate.getTime().getTime() + DateUtils.DAY_IN_MILLIS);
+                        dialog.getDatePicker()
+                                .setMinDate(
+                                        mCreatedDate.getTime().getTime() + DateUtils.DAY_IN_MILLIS);
                     } else {
                         //When created date isn't available
                         dialog.getDatePicker().setMinDate(date.getTime().getTime() + DateUtils.DAY_IN_MILLIS);
@@ -277,7 +280,8 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
 
 class ExpiryDatePickerDialog extends DatePickerDialog {
 
-    public ExpiryDatePickerDialog(Context context, OnDateSetListener callBack, int year, int monthOfYear, int dayOfMonth) {
+    public ExpiryDatePickerDialog(Context context, OnDateSetListener callBack,
+                                  int year, int monthOfYear, int dayOfMonth) {
         super(context, callBack, year, monthOfYear, dayOfMonth);
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index d6e44ee4e..e5b6003b1 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
@@ -55,7 +55,7 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
 
     private Choice mNewKeyAlgorithmChoice;
     private int mNewKeySize;
-    private boolean canEdit = true;
+    private boolean mCanEdit = true;
 
     private ActionBarActivity mActivity;
 
@@ -95,8 +95,8 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
     }
 
     public void setCanEdit(boolean bCanEdit) {
-        canEdit = bCanEdit;
-        if (!canEdit) {
+        mCanEdit = bCanEdit;
+        if (!mCanEdit) {
             mPlusButton.setVisibility(View.INVISIBLE);
         }
     }
@@ -137,7 +137,7 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
      * {@inheritDoc}
      */
     public void onClick(View v) {
-        if (canEdit) {
+        if (mCanEdit) {
             switch (mType) {
                 case Id.type.user_id: {
                     UserIdEditor view = (UserIdEditor) mInflater.inflate(
@@ -151,15 +151,18 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
                 }
 
                 case Id.type.key: {
-                    CreateKeyDialogFragment mCreateKeyDialogFragment = CreateKeyDialogFragment.newInstance(mEditors.getChildCount());
-                    mCreateKeyDialogFragment.setOnAlgorithmSelectedListener(new CreateKeyDialogFragment.OnAlgorithmSelectedListener() {
-                        @Override
-                        public void onAlgorithmSelected(Choice algorithmChoice, int keySize) {
-                            mNewKeyAlgorithmChoice = algorithmChoice;
-                            mNewKeySize = keySize;
-                            createKey();
-                        }
-                    });
+                    CreateKeyDialogFragment mCreateKeyDialogFragment =
+                            CreateKeyDialogFragment.newInstance(mEditors.getChildCount());
+                    mCreateKeyDialogFragment
+                            .setOnAlgorithmSelectedListener(
+                                    new CreateKeyDialogFragment.OnAlgorithmSelectedListener() {
+                                        @Override
+                                        public void onAlgorithmSelected(Choice algorithmChoice, int keySize) {
+                                            mNewKeyAlgorithmChoice = algorithmChoice;
+                                            mNewKeySize = keySize;
+                                            createKey();
+                                        }
+                                    });
                     mCreateKeyDialogFragment.show(mActivity.getSupportFragmentManager(), "createKeyDialog");
                     break;
                 }
@@ -186,7 +189,7 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
             if (mEditors.getChildCount() == 0) {
                 view.setIsMainUserId(true);
             }
-            view.setCanEdit(canEdit);
+            view.setCanEdit(mCanEdit);
             mEditors.addView(view);
         }
 
@@ -207,7 +210,7 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
             view.setEditorListener(this);
             boolean isMasterKey = (mEditors.getChildCount() == 0);
             view.setValue(list.get(i), isMasterKey, usages.get(i));
-            view.setCanEdit(canEdit);
+            view.setCanEdit(mCanEdit);
             mEditors.addView(view);
         }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
index 039e87446..d3c6f02fe 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
@@ -18,6 +18,7 @@ package org.sufficientlysecure.keychain.ui.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.util.Patterns;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -38,14 +39,6 @@ public class UserIdEditor extends LinearLayout implements Editor, OnClickListene
     private AutoCompleteTextView mEmail;
     private EditText mComment;
 
-    // see http://www.regular-expressions.info/email.html
-    // RFC 2822 if we omit the syntax using double quotes and square brackets
-    // android.util.Patterns.EMAIL_ADDRESS is only available as of Android 2.2+
-    private static final Pattern EMAIL_PATTERN = Pattern
-            .compile(
-                    "[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?",
-                    Pattern.CASE_INSENSITIVE);
-
     public static class NoNameException extends Exception {
         static final long serialVersionUID = 0xf812773343L;
 
@@ -142,7 +135,7 @@ public class UserIdEditor extends LinearLayout implements Editor, OnClickListene
         String comment = ("" + mComment.getText()).trim();
 
         if (email.length() > 0) {
-            Matcher emailMatcher = EMAIL_PATTERN.matcher(email);
+            Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(email);
             if (!emailMatcher.matches()) {
                 throw new InvalidEmailException(getContext().getString(R.string.error_invalid_email,
                         email));