Bump version to 3.0.1 preview2

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "net.kdt.pojavlaunch"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 5
-        versionName "3.0.1_preview1_b5_20200509"
+        versionCode 6
+        versionName "3.0.1_preview2_20200510"
     }
 	
     buildTypes {

app/src/main/java/android/androidVNC/VncCanvasActivity.java

@@ -133,36 +133,9 @@ public class VncCanvasActivity extends AppCompatActivity
 		mControlLayout = findViewById(R.id.main_controllayout);
 		mControlLayout.setModifiable(false);
 		if (modPath == null) {
-			ControlButton[] specialButtons = ControlButton.getSpecialButtons();
-			specialButtons[0].specialButtonListener = new View.OnClickListener(){
-				@Override
-				public void onClick(View v) {
-
-				}
-			};
-			specialButtons[1].specialButtonListener = new View.OnClickListener(){
-				@Override
-				public void onClick(View v) {
-					// showKeyboard(); 
-				}
-			};
-			// MetaKeyBean.keysByMouseButton.get(VncCanvas.MOUSE_BUTTON_RIGHT);
-			specialButtons[2].specialButtonListener = new ControlButton.TouchListener(){
-				@Override
-				public void onTouch(boolean down) {
-					// showKeyboard(); 
-				}
-			};
-			specialButtons[3].specialButtonListener = new ControlButton.TouchListener(){
-				@Override
-				public void onTouch(boolean down) {
-					// showKeyboard(); 
-				}
-			};
-			
 			mControlLayout.loadLayout(getSharedPreferences(getPackageName() + "_preferences", MODE_PRIVATE).getString("defaultCtrl", Tools.CTRLMAP_PATH + "/default.json"));
-			mControlLayout.setControlVisible(false);
-			boolean controlVisible = false;
+			mControlLayout.setControlVisible(true);
+			boolean controlVisible = true;
 			for (ControlView specialView : mControlLayout.getSpecialControlViewArray()) {
 				switch (specialView.getProperties().keycode) {
 					case ControlButton.SPECIALBTN_KEYBOARD: 

app/src/main/java/net/kdt/pojavlaunch/Tools.java

@@ -234,10 +234,20 @@ public final class Tools
 
 	public static void showError(final Context ctx, final Throwable e, final boolean exitIfOk)
 	{
-		showError(ctx, e, exitIfOk, false);
+		showError(ctx, ctx.getString(R.string.global_error), e, exitIfOk, false);
+	}
+	
+	public static void showError(Context ctx, String customTitle, Throwable e)
+	{
+		showError(ctx, customTitle, e, false);
+	}
+
+	public static void showError(final Context ctx, String customTitle, final Throwable e, final boolean exitIfOk)
+	{
+		showError(ctx, customTitle, e, exitIfOk, false);
 	}
 
-	private static void showError(final Context ctx, final Throwable e, final boolean exitIfOk, final boolean showMore)
+	private static void showError(final Context ctx, final String customTitle, final Throwable e, final boolean exitIfOk, final boolean showMore)
 	{
 		Runnable runnable = new Runnable(){
 
@@ -246,7 +256,8 @@ public final class Tools
 			{
 				final String errMsg = showMore ? Log.getStackTraceString(e): e.getMessage();
 				new AlertDialog.Builder((Context) ctx)
-					.setTitle(R.string.global_error)
+					//.setTitle(R.string.global_error)
+					.setTitle(customTitle)
 					.setMessage(errMsg)
 					.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
 
@@ -267,7 +278,7 @@ public final class Tools
 						@Override
 						public void onClick(DialogInterface p1, int p2)
 						{
-							showError(ctx, e, exitIfOk, !showMore);
+							showError(ctx, customTitle, e, exitIfOk, !showMore);
 						}
 					})
 					.setNeutralButton(android.R.string.copy, new DialogInterface.OnClickListener(){

app/src/main/java/net/kdt/pojavlaunch/value/customcontrols/ControlButton.java

@@ -60,7 +60,7 @@ public class ControlButton implements Cloneable
 	public boolean holdAlt;
 	public boolean holdShift;
 	*/
-	public Object specialButtonListener;
+	// public Object specialButtonListener;
 	// public boolean hold
 	
 	public ControlButton() {
@@ -88,8 +88,9 @@ public class ControlButton implements Cloneable
 	}
 
 	public ControlButton(String name, int keycode, int keyindex, boolean hidden, float x, float y, int width, int height) {
+		super();
 		this.name = name;
-		this.keycode = keycode;
+		this.keycode = keycode + 4;
 		this.keyindex = keyindex;
 		this.hidden = hidden;
 		this.x = x;

app/src/main/java/net/kdt/pojavlaunch/value/customcontrols/ControlsLayout.java

@@ -61,19 +61,20 @@ public class ControlsLayout extends FrameLayout
 	public void loadLayout(String jsonPath) {
 		try {
 			loadLayout(new Gson().fromJson(Tools.read(jsonPath), CustomControls.class));
-		} catch (Exception e) {
-			e.printStackTrace();
+		} catch (Throwable th) {
+			th.printStackTrace();
+			Tools.showError(getContext(), getContext().getString(R.string.customctrl_error, jsonPath), th);
 		}
 	}
 	
 	public void loadLayout(CustomControls controlLayout) {
 		mLayout = controlLayout;
-		
+
 		// Safety remove only ControlView views
 		for (ControlView view : getControlViewArray()) {
 			removeView(view);
 		}
-		
+
 		for (ControlButton button : controlLayout.button) {
 			addControlView(button);
 		}

app/src/main/res/layout/canvas.xml

@@ -13,23 +13,23 @@
 		android:layout_height="match_parent"
 		android:orientation="vertical">
 
-		<android.androidVNC.VncCanvas
-			android:id="@+id/vnc_canvas"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:layout_gravity="bottom|center"/>
-
-		<ZoomControls
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:id="@+id/zoomer"
-			android:layout_gravity="bottom|center"/>
-
 		<net.kdt.pojavlaunch.value.customcontrols.ControlsLayout
 			android:id="@+id/main_controllayout"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent">
 
+			<android.androidVNC.VncCanvas
+				android:id="@+id/vnc_canvas"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:layout_gravity="bottom|center"/>
+
+			<ZoomControls
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:id="@+id/zoomer"
+				android:layout_gravity="bottom|center"/>
+			
 		</net.kdt.pojavlaunch.value.customcontrols.ControlsLayout>
 		
 		<LinearLayout

app/src/main/res/values/strings.xml

@@ -183,7 +183,8 @@
 
 	<string name="control_more3"></string>
 	<string name="control_more4"></string>
-	
+
+	<string name="customctrl_error">Unable to load control file %s</string>
 	<string name="customctrl_keyname">Keycode</string>
 	<string name="customctrl_specialkey">Special Key</string>
 	<string name="customctrl_hidden">Hidden</string>