Merge branch 'release/2.0.7'

James Stapleton · James Stapleton · commit aba9bba3c49d · 2014-09-21T09:33:20.000-04:00
- Fixed issue with buggy md5v0.6 algo (it allowed using character set other than hex)
- Fixed Unicode encoding issues, now it will properly generate passwords with masterpassword having non-ascii characters in it.
- Allowed the username to be adjustable without modifying the profile, from the main screen
- Fixed issue where Account's pattern names are blank coming in from the chrome plugin
- Fixed issue where Chrome's plugin export used the string 'null' for leet level.
- Added so that when a user copy's a password it will add the used url to the favorites list so that it can be easily reused on the next time
diff --git a/assets/store/pwm-feature.jpg b/assets/store/pwm-feature.jpg
diff --git a/assets/store/pwm-promo-graphic.png b/assets/store/pwm-promo-graphic.png
diff --git a/assets/store/pwm-ring.png b/assets/store/pwm-ring.png
diff --git a/assets/store/store-listing.txt b/assets/store/store-listing.txt
@@ -0,0 +1,25 @@
+#Title
+PasswordMaker Pro
+
+#Short Description
+PasswordMaker creates unique, secure passwords that are not needed to be saved.
+
+#Full Description
+ONE PASSWORD TO RULE THEM ALL
+
+PasswordMaker creates unique, secure passwords that are very easy for you to retrieve but no one else. Nothing is stored anywhere, anytime, so there's nothing to be hacked, lost, or stolen.
+
+You provide PasswordMaker two pieces of information: a "master password" -- that one, single password you like -- and the URL of the website requiring a password. PasswordMaker will then generate a unique password using a one-way hash, which will protect your master password.
+
+Compatible with the other versions of Passwordmaker for other devices and computers.
+
+See http://android.passwordmaker.org/ for more information on PasswordMaker.
+
+If you have questions, comments or concerns please post them on them on the github issue tracker by following the link above.  I do not monitor the ratings and comments here. Also go to the page: http://passwordmaker.org to find other versions for other platforms like the chrome or firefox versions of passwordmaker.
+
+# Categorization
+Application Type: Applications
+Category: Tools
+Content rating: Everyone
+Website: http://android.passwordmaker.org
+Email: pwmp.for.android@gmail.com
diff --git a/passwordmaker/build.gradle b/passwordmaker/build.gradle
@@ -107,7 +107,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     // You must install or update the Support Repository through the SDK manager to use this dependency.
     compile 'com.intellij:annotations:12.0@jar'
-    compile 'org.passwordmaker:passwordmaker-je-lib:0.9.8'
+    compile 'org.passwordmaker:passwordmaker-je-lib:0.9.9'
     compile 'com.madgag.spongycastle:core:1.50.0.0'
     compile 'com.madgag.spongycastle:prov:1.50.0.0'
     androidTestCompile 'junit:junit:4.8.1'
diff --git a/passwordmaker/src/androidTest/java/org/passwordmaker/PwmTest.java b/passwordmaker/src/androidTest/java/org/passwordmaker/PwmTest.java
@@ -27,7 +27,7 @@ protected void performTest(AlgorithmType algorithmType, boolean useHMac, String
         profile.clearUrlComponents();
         profile.addUrlComponent(Account.UrlComponents.Domain);
 
-        SecureCharArray masterPassword = new SecureCharArray("happy");
+        SecureUTF8String masterPassword = new SecureUTF8String("happy");
 
         PasswordMaker pwm = new PasswordMaker();
         assertEquals(expected, saToString(pwm.makePassword(masterPassword, profile, "google.com")));
diff --git a/passwordmaker/src/main/java/org/passwordmaker/android/AccountDetailActivity.java b/passwordmaker/src/main/java/org/passwordmaker/android/AccountDetailActivity.java
@@ -21,7 +21,7 @@
  */
 public class AccountDetailActivity extends Activity {
     @SuppressWarnings("UnusedDeclaration")
-    private static String LOG_TAG = "ADA";
+    private static String LOG_TAG = Logtags.ACCOUNT_DETAIL_ACTIVITY.getTag();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/passwordmaker/src/main/java/org/passwordmaker/android/AccountDetailFragment.java b/passwordmaker/src/main/java/org/passwordmaker/android/AccountDetailFragment.java
@@ -23,7 +23,7 @@
  * on handsets.
  */
 public class AccountDetailFragment extends Fragment {
-    private static final String LOG_TAG = "ADF";
+    private static final String LOG_TAG = Logtags.ACCOUNT_DETAIL_FRAGMENT.getTag();
     /**
      * The fragment argument representing the item ID that this fragment
      * represents.
diff --git a/passwordmaker/src/main/java/org/passwordmaker/android/AccountListActivity.java b/passwordmaker/src/main/java/org/passwordmaker/android/AccountListActivity.java
@@ -38,7 +38,7 @@ public class AccountListActivity extends Activity
         implements AccountListFragment.Callbacks {
 
 
-    private static final String LOG_TAG = "ALA";
+    private static final String LOG_TAG = Logtags.ACCOUNT_LIST_ACTIVITY.getTag();
     /**
      * Whether or not the activity is in two-pane mode, i.e. running on a tablet
      * device.
diff --git a/passwordmaker/src/main/java/org/passwordmaker/android/AccountListFragment.java b/passwordmaker/src/main/java/org/passwordmaker/android/AccountListFragment.java
@@ -40,7 +40,7 @@ public class AccountListFragment extends ListFragment {
     private static final String STATE_ACTIVATED_POSITION = "activated_position";
     public static final String STATE_ACCOUNT_STACK = "activated_account_stack";
     @SuppressWarnings("UnusedDeclaration")
-    private static final String LOG_TAG = "ALF";
+    private static final String LOG_TAG = Logtags.ACCOUNT_LIST_FRAGMENT.getTag();
     /**
      * The fragment's current callback object, which is notified of list item
      * clicks.
diff --git a/passwordmaker/src/main/java/org/passwordmaker/android/ClassicSettingsImporter.java b/passwordmaker/src/main/java/org/passwordmaker/android/ClassicSettingsImporter.java
@@ -21,7 +21,7 @@ public class ClassicSettingsImporter {
     private final Gson gson = new Gson();
     private static final String REPO_PROFILES_FILENAME = "profiles.pss";
     private static final String UPGRADED_MARKER = "profiles.upgrademarker";
-    private static final String LOG_TAG = "PWM/CSI";
+    private static final String LOG_TAG = Logtags.CLASSIC_SETTINGS_IMPORTER.getTag();
 
 
     private ClassicSettingsImporter(Reader reader) throws IOException {
diff --git a/passwordmaker/src/main/java/org/passwordmaker/android/ImportExportRdf.java b/passwordmaker/src/main/java/org/passwordmaker/android/ImportExportRdf.java
@@ -20,7 +20,7 @@
 
 
 public class ImportExportRdf extends Activity {
-    private static final String LOG_TAG = "ImpExPort";
+    private static final String LOG_TAG = Logtags.IMPORT_EXPORT_RDF.getTag();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/passwordmaker/src/main/java/org/passwordmaker/android/Logtags.java b/passwordmaker/src/main/java/org/passwordmaker/android/Logtags.java
@@ -0,0 +1,29 @@
+package org.passwordmaker.android;
+
+public enum Logtags {
+
+
+    MAIN_ACTIVITY("MAIN"),
+    ACCOUNT_DETAIL_ACTIVITY("ADA"),
+    ACCOUNT_DETAIL_FRAGMENT("ADF"),
+    ACCOUNT_LIST_ACTIVITY("ALA"),
+    ACCOUNT_LIST_FRAGMENT("ALF"),
+    CLASSIC_SETTINGS_IMPORTER("CSI"),
+    IMPORT_EXPORT_RDF("IMEX"),
+    PATTERN_DATA_DETAIL_ACTIVITY("PDDA"),
+    PATTERN_DATA_DETAIL_FRAGMENT("PDDF"),
+    PATTERN_DATA_LIST_ACTIVITY("PDLA"),
+    PATTERN_DATA_LIST_FRAGMENT("PDLF"),
+    PWM_APPLICATION("PAPP")
+    ;
+
+    private final String tag;
+    Logtags(String tag) {
+        this.tag = "PWM/" + tag;
+    }
+
+
+    public String getTag() {
+        return tag;
+    }
+}
diff --git a/passwordmaker/src/main/java/org/passwordmaker/android/MainActivity.java b/passwordmaker/src/main/java/org/passwordmaker/android/MainActivity.java
@@ -34,14 +34,15 @@ public class MainActivity extends ActionBarActivity implements AccountManagerLis
     private static final String REPO_KEY_SAVED_INPUT_INPUTTEXT = "savedInputInputText";
     private static final int MIN_PASSWORD_LEN_FOR_VERIFICATION_CODE = 8;
 
-    private static final String LOG_TAG = "PasswordMakerProForAndroidActivity";
+    private static final String LOG_TAG = Logtags.MAIN_ACTIVITY.getTag();
     private AccountManager accountManager;
 
     private static final int EDIT_FAVORITE  = 0x01;
     private static final int LIST_ACCOUNTS = 0x02;
     private static final int SHOW_SETTINGS  = 0x04;
     private static final int UPDATE_VER_CODE = 0xccaabb;
     private static final int VER_CODE_DELAY = 600;
+    private TextView txtUsername;
     private ImageButton btnClearSelectedProfile;
     private Spinner spinAccount;
     private List<Account> accounts = new ArrayList<Account>();
@@ -84,6 +85,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         spinAccount = (Spinner)findViewById(R.id.spinProfile);
         spinAccount.setOnItemSelectedListener(mSpinAccountOnProfileSelect);
+        txtUsername = (TextView) findViewById(R.id.txtUsername);
+        txtUsername.addTextChangedListener(createUpdatePasswordKeyListener());
+        txtUsername.setOnFocusChangeListener(mUpdatePasswordFocusListener);
     }
 
     @Override
@@ -300,7 +304,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
-    protected void updateSelectedProfileText() {
+    protected boolean updateSelectedProfileText() {
         Account account = accountManager.getAccountForInputText(getInputText());
         TextView text = (TextView) findViewById(R.id.lblCurrentProfile);
         String value = account.getName();
@@ -312,9 +316,12 @@ protected void updateSelectedProfileText() {
             if ( btnClearSelectedProfile.getVisibility() != View.VISIBLE )
                 btnClearSelectedProfile.setVisibility(View.VISIBLE);
         }
-        if ( ! text.getText().toString().equals(value) )
+        boolean changed = ! text.getText().toString().equals(value);
+        if ( changed )
             Log.i(LOG_TAG, "Updated selected profile to be: \"" + value + "\"");
+        if ( changed ) setUIAccountUsernameFromAccount();
         text.setText(value);
+        return changed;
     }
 
     @SuppressWarnings("UnusedDeclaration")
@@ -344,18 +351,25 @@ private void showUsernameBasedOnPreference() {
     }
 
     private void showUsernameField() {
-        TextView username = (TextView) findViewById(R.id.txtUsername);
-        username.setVisibility(View.VISIBLE);
-        username = (TextView)findViewById(R.id.lblUsername);
-        username.setVisibility(View.VISIBLE);
+        txtUsername.setVisibility(View.VISIBLE);
+        TextView lblUsername = (TextView)findViewById(R.id.lblUsername);
+        lblUsername.setVisibility(View.VISIBLE);
 
     }
 
     private void hideUsernameField() {
-        TextView username = (TextView) findViewById(R.id.txtUsername);
-        username.setVisibility(View.GONE);
-        username = (TextView)findViewById(R.id.lblUsername);
-        username.setVisibility(View.GONE);
+        txtUsername.setVisibility(View.GONE);
+        TextView lblUsername = (TextView)findViewById(R.id.lblUsername);
+        lblUsername.setVisibility(View.GONE);
+    }
+
+    private boolean isUsernameVisibible() {
+        return txtUsername.getVisibility() == View.VISIBLE;
+    }
+
+    private boolean shouldAutoAddInputIntoFavorites() {
+        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+        return sharedPref.getBoolean(SettingsActivity.KEY_AUTO_ADD_INPUT_FAVS, true);
     }
 
     private void showPassStrengthBasedOnPreference() {
@@ -402,17 +416,15 @@ private void resetPassStrengthMeter() {
     }
 
     private void setUIAccountUsernameFromAccount() {
-        TextView username = (TextView) findViewById(R.id.txtUsername);
         Account account = accountManager.getAccountForInputText(getInputText());
-        username.setText(account.getUsername());
+        txtUsername.setText(account.getUsername());
     }
 
-    private void clearUIAccountUsername() {
-        TextView username = (TextView) findViewById(R.id.txtUsername);
-        username.setText("");
+    private String getUIAccountUsername() {
+        if (!isUsernameVisibible()) return null;
+        return txtUsername.getText().toString();
     }
 
-
     private String getInputText() {
         TextView inputText = (TextView) findViewById(R.id.txtInput);
         return inputText.getText().toString();
@@ -429,6 +441,7 @@ private void setInputText(String value) {
     public void onSelectedProfileChange(Account newProfile) {
         TextView text = (TextView) findViewById(R.id.lblCurrentProfile);
         text.setText(newProfile.getName());
+        setUIAccountUsernameFromAccount();
         updatePassword(false);
     }
 
@@ -442,21 +455,20 @@ public void onFocusChange(View v, boolean hasFocus) {
     };
 
     private void updatePassword(boolean requireMinLength) {
-        final SecureCharArray masterPassword = new SecureCharArray(getInputPassword());
+        final SecureUTF8String masterPassword = new SecureUTF8String(getInputPassword());
         final TextView outputPassword = (TextView) findViewById(R.id.txtPassword);
         if (!requireMinLength || masterPassword.length() >= MIN_PASSWORD_LEN_FOR_VERIFICATION_CODE ) {
             updateVerificationCode();
             updateSelectedProfileText();
             final String inputText = getInputText();
+            final String username = getUIAccountUsername();
             try {
                 if (accountManager.matchesPasswordHash(masterPassword)) {
-                    SecureCharArray output = accountManager.generatePassword(masterPassword, inputText);
+                    SecureCharArray output = accountManager.generatePassword(masterPassword, inputText, username);
                     outputPassword.setText(output);
                     setPassStrengthMeter(output);
-                    setUIAccountUsernameFromAccount();
                 } else {
                     outputPassword.setText("Password Hash Mismatch");
-                    clearUIAccountUsername();
                     resetPassStrengthMeter();
                 }
             } finally {
@@ -465,8 +477,6 @@ private void updatePassword(boolean requireMinLength) {
         } else {
             outputPassword.setText("");
             setVerificationCode("");
-            clearUIAccountUsername();
-            clearUIAccountUsername();
             resetPassStrengthMeter();
             // if we have one already enqueue reset so that we don't keep on updating uselessly
             updateValidationCodeHandler.removeMessages(UPDATE_VER_CODE);
@@ -477,14 +487,14 @@ private void updatePassword(boolean requireMinLength) {
     protected void updateVerificationCode() {
         final String masterPassword = getInputPassword();
         try {
-            setVerificationCode(accountManager.getPwm().generateVerificationCode(new SecureCharArray(masterPassword)));
+            setVerificationCode(accountManager.getPwm().generateVerificationCode(new SecureUTF8String(masterPassword)));
         } catch (Exception e) {
             Log.e(LOG_TAG, "Error generating verification code", e);
             setVerificationCode("ERROR");
         }
     }
 
-    private void setVerificationCode(SecureCharArray code) {
+    private void setVerificationCode(SecureUTF8String code) {
         setVerificationCode(new String(code.getData()));
     }
 
@@ -526,7 +536,19 @@ public void onClick(View v) {
             final ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
             TextView text = (TextView) findViewById(R.id.txtPassword);
             clipboard.setText(text.getText());
-            Toast.makeText(MainActivity.this, "Copied password to the clipboard", Toast.LENGTH_SHORT).show();
+            String inputText = getInputText();
+
+            final boolean shouldAdd = shouldAutoAddInputIntoFavorites() &&
+                    !containsIgnoreCase(accountManager.getFavoriteUrls(), inputText);
+            if (shouldAdd) {
+                accountManager.getFavoriteUrls().add(inputText);
+                favoritesList.add(inputText); // local view for favorites
+            }
+
+            String toastText = "Copied password to the clipboard";
+            if (shouldAdd)
+                toastText += " (Favorite added)";
+            Toast.makeText(MainActivity.this, toastText, Toast.LENGTH_SHORT).show();
         }
     };
 
@@ -537,6 +559,7 @@ public void onClick(View v) {
         public void onClick(View v) {
             accountManager.clearSelectedAccount();
             setProfileDropdownBySelectedAccount();
+            setUIAccountUsernameFromAccount();
             updatePassword(true);
             Toast.makeText(MainActivity.this, "Cleared manually selected account", Toast.LENGTH_SHORT).show();
         }
@@ -573,4 +596,12 @@ public void onNothingSelected(AdapterView<?> parent) {
 
         }
     };
+
+
+    public static boolean containsIgnoreCase(Collection<String> col, String str) {
+        for ( String i : col ) {
+            if ( i.equalsIgnoreCase(str) ) return true;
+        }
+        return false;
+    }
 }
diff --git a/passwordmaker/src/main/java/org/passwordmaker/android/PatternDataListActivity.java b/passwordmaker/src/main/java/org/passwordmaker/android/PatternDataListActivity.java
@@ -29,7 +29,7 @@
 public class PatternDataListActivity extends Activity
         implements PatternDataListFragment.Callbacks {
     @SuppressWarnings("UnusedDeclaration")
-    private static final String LOG_TAG = "PDLA";
+    private static final String LOG_TAG = Logtags.PATTERN_DATA_LIST_ACTIVITY.getTag();
     /**
      * Whether or not the activity is in two-pane mode, i.e. running on a tablet
      * device.
diff --git a/passwordmaker/src/main/java/org/passwordmaker/android/PwmApplication.java b/passwordmaker/src/main/java/org/passwordmaker/android/PwmApplication.java
@@ -40,7 +40,7 @@
  */
 public class PwmApplication {
 
-    private static final String LOG_TAG = "PwmApplication";
+    private static final String LOG_TAG = Logtags.PWM_APPLICATION.getTag();
     private static final String PROFILE_DB_FILE = "profile_database.rdf";
 
     private static PwmApplication sInstance;
diff --git a/passwordmaker/src/main/java/org/passwordmaker/android/SettingsActivity.java b/passwordmaker/src/main/java/org/passwordmaker/android/SettingsActivity.java
@@ -15,6 +15,7 @@ public class SettingsActivity extends Activity {
     public static final String KEY_SAVED_LENGTH = "pref_saveInputs";
     public static final String KEY_SHOW_PASS_STRENGTH = "pref_showPasswordStrength";
     public static final String KEY_MASTER_PASSWORD_HASH = "pref_masterPasswordHash";
+    public static final String KEY_AUTO_ADD_INPUT_FAVS = "pref_AutoAddTextToFavorites";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/passwordmaker/src/main/res/values/strings.xml b/passwordmaker/src/main/res/values/strings.xml
@@ -137,5 +137,6 @@
     <string name="defaultProgressValue">0</string>
     <string name="ViewAccount">View Account</string>
     <string name="ViewAccountShort">View</string>
+    <string name="autoAddTextToFavs">Auto Add Input to Favorites</string>
 
 </resources>
diff --git a/passwordmaker/src/main/res/xml/preferences.xml b/passwordmaker/src/main/res/xml/preferences.xml
@@ -21,4 +21,8 @@
             android:defaultValue="false"
             android:key="pref_showPasswordStrength"
             android:title="@string/showPasswordStrength" />
+    <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="pref_AutoAddTextToFavorites"
+            android:title="@string/autoAddTextToFavs" />
 </PreferenceScreen>
