Bugfix where wasCancelled was not reset upon recreating the GetTextFragment.

Author: iiordanov

eclipse_projects/bVNC/res/values-ru/strings.xml

@@ -316,6 +316,7 @@
 <string name="master_password_error_failed_to_enable">Не удалось включить мастер-пароль. Проверьте свободное место на Вашем устройстве и повторите попытку.</string>
 <string name="master_password_error_failed_to_disable">Не удалось отключить мастер-пароль. Проверьте свободное место на Вашем устройстве и повторите попытку.</string>
 <string name="master_password_error_password_necessary">Мастер-пароль требуется для того, чтобы продолжить.</string>
+<string name="master_password_error_password_not_set">Установка мастер-пароля была отменена.</string>
 <string name="master_password_error_wrong_password">Неправильный мастер-пароль введен.</string>
 <string name="master_password_hint_once">Введите Пароль</string>
 <string name="master_password_hint_twice">Повторите Пароль</string>

eclipse_projects/bVNC/res/values/strings.xml

@@ -317,6 +317,7 @@ If you are looking for a quick performance boost, try setting the Color mode to
 <string name="master_password_error_failed_to_enable">Could not enable master password. Check free space on your device and try again.</string>
 <string name="master_password_error_failed_to_disable">Could not disable master password. Check free space on your device and try again.</string>
 <string name="master_password_error_password_necessary">Master Password is required in order to continue, quitting.</string>
+<string name="master_password_error_password_not_set">Setting Master Password was cancelled.</string>
 <string name="master_password_error_wrong_password">Wrong Master Password entered, quitting.</string>
 <string name="master_password_hint_once">Enter Password</string>
 <string name="master_password_hint_twice">Repeat Password</string>

eclipse_projects/bVNC/src/com/iiordanov/bVNC/MainConfiguration.java

@@ -39,7 +39,6 @@ public abstract class MainConfiguration extends FragmentActivity implements GetT
     private final static String TAG = "MainConfiguration";
 
     private boolean togglingMasterPassword = false;
-    protected static PasswordManager passwordManager = null;
 
     protected ConnectionBean selected;
     protected Database database;
@@ -356,20 +355,6 @@ private void toggleMasterPasswordState () {
         Log.i(TAG, "Toggled master password state");
     }
 
-    private void setMasterPasswordHash (String password) throws UnsupportedEncodingException,
-                                                                NoSuchAlgorithmException, InvalidKeySpecException {
-        // Now compute and store the hash of the provided password and saved salt.
-        String salt = PasswordManager.randomBase64EncodedString(Constants.saltLength);
-        String hash = PasswordManager.computeHash(password, PasswordManager.b64Decode(salt));
-        SharedPreferences sp = getSharedPreferences("generalSettings", Context.MODE_PRIVATE);
-        Editor editor = sp.edit();
-        editor.putString("masterPasswordSalt", salt);
-        editor.putString("masterPasswordHash", hash);
-        editor.apply();
-        Log.i(TAG, "Setting master password hash.");
-        //Log.i(TAG, String.format("hash: %s, salt: %s", hash, new String(PasswordManager.b64Decode(salt))));
-    }
-    
     private boolean checkMasterPassword (String password) {
         Log.i(TAG, "Checking master password.");
         boolean result = false;
@@ -446,6 +431,7 @@ public void handlePasword(String providedPassword, boolean wasCancelled) {
                 } else {
                     // No need to show error message because user cancelled consciously.
                     Log.i(TAG, "Dialog cancelled, not setting master password.");
+                    Utils.showErrorMessage(this, getResources().getString(R.string.master_password_error_password_not_set));
                 }
                 removeGetPasswordFragments();
                 arriveOnPage();

eclipse_projects/bVNC/src/com/iiordanov/bVNC/dialogs/GetTextFragment.java

@@ -106,13 +106,13 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     	android.util.Log.i(TAG, "onCreateView called");
+    	wasCancelled = false;
 
         getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN|WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
 
     	// Set title for this dialog
     	getDialog().setTitle(title);
     	View v = null;
-    	
 
         switch (dialogType) {
         case Plaintext: