Added detection and handling of errors around creating shortcuts and intents when master password is enabled.

Author: iiordanov

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

@@ -317,6 +317,8 @@
 <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_intents_not_supported">Connection intents are not yet supported when Master Password is enabled.</string>
+<string name="master_password_error_shortcuts_not_supported">Короткие сокращения пока не поддерживаются, когда мастер-пароль включена.</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

@@ -318,6 +318,8 @@ If you are looking for a quick performance boost, try setting the Color mode to
 <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.</string>
 <string name="master_password_error_password_not_set">Setting Master Password was cancelled.</string>
+<string name="master_password_error_intents_not_supported">Connection intents are not yet supported when Master Password is enabled.</string>
+<string name="master_password_error_shortcuts_not_supported">Short-cuts are not yet supported when Master Password is enabled.</string>
 <string name="master_password_error_wrong_password">Could not authenticate with provided Master Password.</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/ConnectionListActivity.java

@@ -21,7 +21,9 @@
 package com.iiordanov.bVNC;
 
 import android.app.ListActivity;
+import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.Intent.ShortcutIconResource;
 import android.database.Cursor;
 import android.net.Uri;
@@ -42,10 +44,11 @@ public class ConnectionListActivity extends ListActivity {
     protected void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
 
-        try {
-            database = new Database(this);
-        } catch (Exception e) {
-            Utils.showFatalErrorMessage(this, "ERROR, could not open database, could it be its encryped?");
+        database = new Database(this);
+        
+        if (isMasterPasswordEnabled()) {
+            Utils.showFatalErrorMessage(this, getResources().getString(R.string.master_password_error_shortcuts_not_supported));
+            return;
         }
 
         // Query for all people contacts using the Contacts.People convenience class.
@@ -119,8 +122,14 @@ protected void onListItemClick(ListView l, View v, int position, long id) {
      */
     @Override
     protected void onDestroy() {
-        database.close();
+        if (database != null) {
+            database.close();
+        }
         super.onDestroy();
     }
 
+    private boolean isMasterPasswordEnabled() {
+        SharedPreferences sp = getSharedPreferences(Constants.generalSettingsTag, Context.MODE_PRIVATE);
+        return sp.getBoolean(Constants.masterPasswordEnabledTag, false);
+    }
 }

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

@@ -173,8 +173,10 @@ public class Constants {
     public static final int numIterations = 10000;
     public static final int keyLength = 256;
     public static final int saltLength = 256;
-
-
+    
+    public static final String generalSettingsTag = "generalSettings";
+    public static final String masterPasswordEnabledTag = "masterPasswordEnabled";
+    
     /**
      * Returns a string matching a session selection index
      * @param index - index to convert

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

@@ -82,6 +82,10 @@ public SQLiteDatabase getReadableDatabase() {
         return getReadableDatabase(Database.password);
     }
 
+    public static String getPassword() {
+        return password;
+    }
+    
     public static void setPassword (String newPassword) {
         Database.password = newPassword;
     }
@@ -343,8 +347,4 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             oldVersion = DBV_2_1_4;
         }
     }
-
-    public static String getPassword() {
-        return password;
-    }
 }

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

@@ -341,12 +341,12 @@ public void onClick(DialogInterface dialog, int i)
         return true;
     }
 
-    private boolean isMasterPasswordEnabled () {
-        SharedPreferences sp = getSharedPreferences("generalSettings", Context.MODE_PRIVATE);
-        return sp.getBoolean("masterPasswordEnabled", false);
+    private boolean isMasterPasswordEnabled() {
+        SharedPreferences sp = getSharedPreferences(Constants.generalSettingsTag, Context.MODE_PRIVATE);
+        return sp.getBoolean(Constants.masterPasswordEnabledTag, false);
     }
 
-    private void toggleMasterPasswordState () {
+    private void toggleMasterPasswordState() {
         SharedPreferences sp = getSharedPreferences("generalSettings", Context.MODE_PRIVATE);
         boolean state = sp.getBoolean("masterPasswordEnabled", false);
         Editor editor = sp.edit();

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

@@ -36,6 +36,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.database.Cursor;
 import android.graphics.Rect;
@@ -138,7 +139,7 @@ public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         Utils.showMenu(this);
         initialize();
-        if (connection.isReadyForConnection())
+        if (connection != null && connection.isReadyForConnection())
         	continueConnecting();
     }
 
@@ -161,8 +162,13 @@ void initialize () {
 
         Uri data = i.getData();
         if ((data != null) && (data.getScheme().equals("vnc")) || !Utils.isNullOrEmptry(i.getType())) {
+            if (isMasterPasswordEnabled()) {
+                Utils.showFatalErrorMessage(this, getResources().getString(R.string.master_password_error_intents_not_supported));
+                return;
+            }
+            
             connection = ConnectionBean.createLoadFromUri(data, this);
-
+            
             String host = data.getHost();
             if (!host.startsWith(Constants.CONNECTION)) {
                 connection.parseFromUri(data);
@@ -1328,4 +1334,9 @@ protected void onSaveInstanceState(Bundle outState) {
         outState.putString("WORKAROUND_FOR_BUG_19917_KEY", "WORKAROUND_FOR_BUG_19917_VALUE");
         super.onSaveInstanceState(outState);
     }
+    
+    private boolean isMasterPasswordEnabled() {
+        SharedPreferences sp = getSharedPreferences(Constants.generalSettingsTag, Context.MODE_PRIVATE);
+        return sp.getBoolean(Constants.masterPasswordEnabledTag, false);
+    }
 }