Additional changes needed by Android Studio release builds.

Author: iiordanov

.idea/gradle.xml

@@ -18,7 +18,11 @@ android {
     }
 
     sourceSets {
-        main.java.srcDirs = 'src2/main/'
+        main.java.srcDirs += 'src2/main/'
+    }
+
+    sourceSets.main {
+        jniLibs.srcDir 'src2/main/jniLibs'
     }
 }
 

bVNC/build.gradle

@@ -0,0 +1 @@
+../../src2/main/AndroidManifest.xml

bVNC/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+../../src2/main/res/

bVNC/src/main/res

@@ -76,15 +76,15 @@ public void afterTextChanged(Editable arg0) {}
     private int dialogType = 0;
     private int messageNum = 0;
     private int errorNum = 0;
-    
-	public GetTextFragment (OnFragmentDismissedListener dismissalListener) {
-		this.dismissalListener = dismissalListener;
-	}
-    
+
+    public GetTextFragment () {
+    }
+
 	public static GetTextFragment newInstance(String title, OnFragmentDismissedListener dismissalListener,
 	                                          int dialogType, int messageNum, int errorNum) {
     	android.util.Log.i(TAG, "newInstance called");
-    	GetTextFragment f = new GetTextFragment(dismissalListener);
+    	GetTextFragment f = new GetTextFragment();
+    	f.setDismissalListener(dismissalListener);
 
         Bundle args = new Bundle();
         args.putString("title", title);
@@ -160,7 +160,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         return v;
     }
-    
+
+    public void setDismissalListener (OnFragmentDismissedListener dismissalListener) {
+        this.dismissalListener = dismissalListener;
+    }
+
     private void hideText (EditText textBox) {
         textBox.setTransformationMethod(new PasswordTransformationMethod());
     }
@@ -217,7 +221,9 @@ public void onDismiss (DialogInterface dialog) {
     	if (textBox2 != null) {
     	    textBox2.setText("");
     	}
-    	dismissalListener.onTextObtained(result, wasCancelled);
+    	if (dismissalListener != null) {
+            dismissalListener.onTextObtained(result, wasCancelled);
+        }
     }
 
     @Override

bVNC/src2/main/java/com/iiordanov/bVNC/dialogs/GetTextFragment.java

@@ -113,7 +113,6 @@
 		android:padding="0sp"
 		>
 		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		    android:id="@+id/layoutCtrlAltKeys"
     	    android:layout_gravity="top|left"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -137,7 +136,6 @@
 	    	    />
 		</LinearLayout>
 		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		    android:id="@+id/layoutCtrlAltKeys"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:orientation="horizontal"
@@ -162,7 +160,7 @@
 	</LinearLayout>
 
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:id="@+id/layoutArrowKeys"
+		android:id="@+id/layoutArrowKeys"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_alignParentRight="true"
@@ -177,7 +175,6 @@
 	        android:layout_gravity="top|center"
 	        />
 		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		    android:id="@+id/layoutArrowKeys"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignParentRight="true"

bVNC/src2/main/res/layout-large/canvas.xml

@@ -113,7 +113,6 @@
 		android:padding="0sp"
 		>
 		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		    android:id="@+id/layoutCtrlAltKeys"
     	    android:layout_gravity="top|left"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -137,7 +136,6 @@
 	    	    />
 		</LinearLayout>
 		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		    android:id="@+id/layoutCtrlAltKeys"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:orientation="horizontal"
@@ -162,7 +160,7 @@
 	</LinearLayout>
 
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:id="@+id/layoutArrowKeys"
+		android:id="@+id/layoutArrowKeys"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_alignParentRight="true"
@@ -177,7 +175,6 @@
 	        android:layout_gravity="top|center"
 	        />
 		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		    android:id="@+id/layoutArrowKeys"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignParentRight="true"