Bugfix for master password.

Build 115119. Changelog update.

Author: iiordanov

CustomVnc-app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.CUSTOM_VNC_APP_PACKAGE_NAME"
     android:installLocation="auto"
-    android:versionCode="115118"
+    android:versionCode="115119"
     android:versionName="v5.1.1">
 
     <uses-permission tools:node="removeAll" />

Opaque-app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.undatech.opaque"
-    android:versionCode="115118"
+    android:versionCode="115119"
     android:versionName="v5.1.1">
 
     <uses-feature

aRDP-app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.aRDP"
     android:installLocation="auto"
-    android:versionCode="115118"
+    android:versionCode="115119"
     android:versionName="v5.1.1">
 
     <uses-permission tools:node="removeAll" />

aSPICE-app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.aSPICE"
     android:installLocation="auto"
-    android:versionCode="115118"
+    android:versionCode="115119"
     android:versionName="v5.1.1">
 
     <uses-feature

bVNC-app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.bVNC"
     android:installLocation="auto"
-    android:versionCode="115118"
+    android:versionCode="115119"
     android:versionName="v5.1.1">
 
     <uses-permission tools:node="removeAll" />

bVNC/CHANGELOG-aRDP

@@ -4,6 +4,7 @@ v5.1.1
 - Bugfix for Simulated Touchpad Drag&Drop
 - Feature to hide thumbnails
 - Feature to display only nicknames
+- Bugfix for master password
 v5.1.0
 - Handling Keypad Return key
 - Handling of DPAD Center as Return key on Android TV

bVNC/CHANGELOG-aSPICE

@@ -6,6 +6,7 @@ v5.1.1
 - Feature to display only nicknames
 - New file picker for import CA from file
 - Clipboard copy/paste integration with remote VM
+- Bugfix for master password
 v5.1.0
 - Stability during reconnection improvements
 - Fixes for synchronizing remote resolution

bVNC/CHANGELOG-bVNC

@@ -3,6 +3,7 @@ v5.1.1
 - Bugfix for Simulated Touchpad Drag&Drop
 - Feature to hide thumbnails
 - Feature to display only nicknames
+- Bugfix for master password
 v5.1.0
 - Handling Keypad Return key
 - Improved logging during at disconnection

bVNC/src/main/java/com/undatech/opaque/ConnectionGridActivity.java

@@ -79,7 +79,6 @@ public class ConnectionGridActivity extends FragmentActivity implements GetTextF
     FragmentManager fragmentManager = getSupportFragmentManager();
     private Context appContext;
     private GridView gridView;
-    private ConnectionLoader connectionLoader;
     private EditText search;
     private boolean isConnecting = false;
     protected Database database;
@@ -94,8 +93,6 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         appContext = getApplicationContext();
-        boolean connectionsInSharedPrefs = Utils.isOpaque(this);
-        connectionLoader = new ConnectionLoader(appContext, this, connectionsInSharedPrefs);
         setContentView(R.layout.grid_view_activity);
 
         gridView = (GridView) findViewById(R.id.gridView);
@@ -137,9 +134,6 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { }
             public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
             @Override
             public void afterTextChanged(Editable s) {
-                if (connectionLoader == null) {
-                    return;
-                }
                 createAndSetLabeledImageAdapterAndNumberOfColumns();
             }
         });
@@ -167,10 +161,16 @@ public void onClick(View v) {
         });
     }
 
+    private ConnectionLoader getConnectionLoader(Context context) {
+        boolean connectionsInSharedPrefs = Utils.isOpaque(context);
+        ConnectionLoader connectionLoader = new ConnectionLoader(appContext, this, connectionsInSharedPrefs);
+        return connectionLoader;
+    }
+
     private void createAndSetLabeledImageAdapterAndNumberOfColumns() {
         LabeledImageApapter labeledImageApapter = new LabeledImageApapter(
                 ConnectionGridActivity.this,
-                connectionLoader.loadConnectionsById(),
+                getConnectionLoader(this).loadConnectionsById(),
                 search.getText().toString().toLowerCase().split(" "),
                 2);
         gridView.setAdapter(labeledImageApapter);
@@ -188,6 +188,7 @@ private void launchConnection(View v) {
         isConnecting = true;
         String runtimeId = (String) ((TextView) v.findViewById(R.id.grid_item_id)).getText();
         Intent intent = new Intent(ConnectionGridActivity.this, GeneralUtils.getClassByName("com.iiordanov.bVNC.RemoteCanvasActivity"));
+        ConnectionLoader connectionLoader = getConnectionLoader(this);
         if (Utils.isOpaque(this)) {
             ConnectionSettings cs = (ConnectionSettings) connectionLoader.getConnectionsById().get(runtimeId);
             cs.loadFromSharedPreferences(appContext);
@@ -204,6 +205,7 @@ private void launchConnection(View v) {
     private void editConnection(View v) {
         android.util.Log.d(TAG, "Modify Connection");
         String runtimeId = (String) ((TextView) v.findViewById(R.id.grid_item_id)).getText();
+        ConnectionLoader connectionLoader = getConnectionLoader(this);
         Connection conn = connectionLoader.getConnectionsById().get(runtimeId);
         Intent intent = new Intent(ConnectionGridActivity.this, Utils.getConnectionSetupClass(this));
         if (Utils.isOpaque(this)) {
@@ -226,6 +228,7 @@ private void deleteConnection(View v) {
                 new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int i) {
+                ConnectionLoader connectionLoader = getConnectionLoader(ConnectionGridActivity.this);
                 if (Utils.isOpaque(ConnectionGridActivity.this)) {
 
                     String newListOfConnections = new String();

freeaRDP-app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.freeaRDP"
     android:installLocation="auto"
-    android:versionCode="115118"
+    android:versionCode="115119"
     android:versionName="v5.1.1">
 
     <uses-permission tools:node="removeAll" />