From 56c06d7c0152d147e9498eaf41148329472b606e Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Sat, 10 Oct 2015 22:37:09 +0300
Subject: [PATCH 1/3] Update buildscripts and manifest(set debuggable to false)

---
 AndroidManifest.xml | 2 +-
 build.sh            | 6 +++---
 debug.sh            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b1b99648..79243874 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,7 @@
     <application android:label="@string/app_name"
                  android:icon="@drawable/ic_launcher"
                  android:allowBackup="true"
-                 
+                 android:debuggable="false"
                  android:hardwareAccelerated="true">
         <activity android:name="in.celest.xash3d.LauncherActivity"
                   android:label="@string/launcher_name"
diff --git a/build.sh b/build.sh
index 8e2c4795..d009bc83 100755
--- a/build.sh
+++ b/build.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=0 SUPPORT_WEBP=false V=1
+ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=0 V=0 XASH_SDL=1 -j8 APP_CFLAGS="-w"
 sh gen-version.sh default-release
 ant release
-#jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid
+jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid
 #adb install -r -f bin/xashdroid-debug.apk
 rm bin/xashdroid-release.apk
-/opt/android-sdk-update-manager/build-tools/19.1.0/zipalign 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk
+/home/a1ba/.android/android-sdk-linux/build-tools/22.0.1/zipalign 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk
diff --git a/debug.sh b/debug.sh
index d8929ca3..5871fb45 100755
--- a/debug.sh
+++ b/debug.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=1 SUPPORT_WEBP=false V=1 -j3 APP_CFLAGS="-gdwarf-3"
+ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=1 SUPPORT_WEBP=false V=1 -j3 APP_CFLAGS="-gdwarf-3" XASH_SDL=1
 sh gen-version.sh default-debug
 ant debug
 #jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid -storepass 529459

From 0e3e1d8af963598b27438133dbf59c8770735186 Mon Sep 17 00:00:00 2001
From: a1batross <a1ba.omarov@gmail.com>
Date: Sat, 10 Oct 2015 22:37:58 +0300
Subject: [PATCH 2/3] Remove unused line

---
 build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.sh b/build.sh
index d009bc83..4b6382a3 100755
--- a/build.sh
+++ b/build.sh
@@ -4,6 +4,5 @@ ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=0 V=0 XASH_SDL=1 -j8 APP_CFLAGS="-
 sh gen-version.sh default-release
 ant release
 jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid
-#adb install -r -f bin/xashdroid-debug.apk
 rm bin/xashdroid-release.apk
 /home/a1ba/.android/android-sdk-linux/build-tools/22.0.1/zipalign 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk

From f8a0acd77627bc6d28327445300bfc1daf2e2a1e Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 8 Nov 2015 01:09:57 +0600
Subject: [PATCH 3/3] Improvements in launcher and shortcuts

---
 res/layout/activity_launcher.xml           |  7 ++-
 res/layout/activity_shortcut.xml           | 19 +++++++-
 res/values-ru/strings.xml                  |  1 +
 res/values/strings.xml                     |  2 +
 src/in/celest/xash3d/LauncherActivity.java | 50 ++++++++++++++++++++--
 src/in/celest/xash3d/ShortcutActivity.java |  5 ++-
 6 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index 41f7d210..7006e433 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -38,12 +38,17 @@
 				android:textAppearance="?android:attr/textAppearanceMedium"
 				android:text="@string/text_res_path"
 				android:id="@+id/textView_path" />
-
 			<EditText
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:id="@+id/cmdPath" />
 
+			<Button
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/select_folder"
+				android:id="@+id/button_select"
+				android:onClick="selectFolder" />
 			<CheckBox
 				android:layout_height="wrap_content"
 				android:layout_width="wrap_content"
diff --git a/res/layout/activity_shortcut.xml b/res/layout/activity_shortcut.xml
index ee35378b..4092cfdc 100644
--- a/res/layout/activity_shortcut.xml
+++ b/res/layout/activity_shortcut.xml
@@ -18,7 +18,7 @@
 		android:id="@+id/shortcut_buttonOk"
 		android:layout_alignParentRight="true"
 		android:onClick="saveShortcut"
-		android:layout_below="@+id/shortcut_gamedir"/>
+		android:layout_below="@+id/shortcut_pkgname"/>
 
 	<EditText
 		android:layout_height="wrap_content"
@@ -68,5 +68,22 @@
 		android:layout_below="@+id/shortcut_cmdArgs"
 		android:layout_alignParentRight="true"/>
 
+
+	<EditText
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/shortcut_pkgname"
+		android:layout_below="@+id/shortcut_pkgname_text"
+		android:layout_alignParentRight="true"/>
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:text="@string/pkgname"
+		android:id="@+id/shortcut_pkgname_text"
+		android:layout_below="@+id/shortcut_gamedir"
+		android:layout_alignParentRight="true"/>
+
 </RelativeLayout>
 
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c5ed9124..d8ab3434 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -9,6 +9,7 @@
 	<string name="text_shortcut">Ярлык Xash3D</string>
 	<string name="shortcut_button_save">Сохранить ярлык</string>
 	<string name="gamedir">Каталог мода</string>
+	<string name="pkgname">Пакет мода (только для экспертов)</string>
 	<string name="shortcut_name">Название ярлыка</string>
 	<string name="about_authors">Порт на Android осуществлен командой SDLash3D:\n
 &#8226; a1batross\n
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f7b3bf2a..53e1d12d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,6 +22,7 @@
 	<string name="text_shortcut_test">Xash3D_test shortcut</string>
 	<string name="shortcut_button_save">Save shortcut</string>
 	<string name="gamedir">Mod directory</string>
+	<string name="pkgname">Mod package name (experts only)</string>
 	<string name="shortcut_name">Shortcut name</string>
 
 <!-- TODO: Remove or change this placeholder text -->
@@ -40,4 +41,5 @@ Special thanks to:\n
 &#8226; libSDL2 developers.\n</string>
     <string name="about_button">About Xash3D Android</string>
     <string name="create_shortcut_button">Create mod shortcut</string>
+    <string name="select_folder">(select)</string>
 </resources>
diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java
index c46fe938..7beea562 100644
--- a/src/in/celest/xash3d/LauncherActivity.java
+++ b/src/in/celest/xash3d/LauncherActivity.java
@@ -3,6 +3,7 @@ package in.celest.xash3d;
 import android.app.Activity;
 import android.app.Dialog;
 import android.os.Bundle;
+import android.os.Build;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -10,11 +11,18 @@ import android.content.Intent;
 import android.widget.EditText;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.Button;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.SharedPreferences;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnDismissListener;
+import android.net.Uri;
+import android.os.Environment;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.io.File;
 
 import in.celest.xash3d.hl.R;
 import com.beloko.touchcontrols.TouchControlsSettings;
@@ -27,10 +35,20 @@ public class LauncherActivity extends Activity {
 	static CheckBox useVolume;
 	static EditText resPath;
 	static SharedPreferences mPref;
+	String getDefaultPath()
+	{
+		File dir = Environment.getExternalStorageDirectory();
+		if( dir != null && dir.exists() )
+			return dir.getPath() + "/xash";
+		return "/sdcard/xash";
+	}
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_launcher);
+        Button selectFolder = ( Button ) findViewById( R.id.button_select );
+		if ( Build.VERSION.SDK_INT < 21 )
+			selectFolder.setVisibility( View.GONE );
 		mSettings=new TouchControlsSettings();
 		mSettings.setup(this, null);
 		mSettings.loadSettings(this);
@@ -42,8 +60,8 @@ public class LauncherActivity extends Activity {
 		useVolume = ( CheckBox ) findViewById( R.id.useVolume );
 		useVolume.setChecked(mPref.getBoolean("usevolume",true));
 		resPath = ( EditText ) findViewById( R.id.cmdPath );
-		resPath.setText(mPref.getString("basedir","/sdcard/xash/"));
-		}
+		resPath.setText(mPref.getString("basedir", getDefaultPath()));
+	}
     
     public void startXash(View view)
     {
@@ -79,7 +97,33 @@ public class LauncherActivity extends Activity {
 			}
 		});
 	}
-	
+
+	public void selectFolder(View view)
+	{
+		Intent intent = new Intent("android.intent.action.OPEN_DOCUMENT_TREE");
+		startActivityForResult(intent, 42);
+		resPath.setEnabled(false);
+	}
+
+	public void onActivityResult(int requestCode, int resultCode, Intent resultData) {
+		if (resultCode == RESULT_OK) {
+try{
+			final List<String> paths = resultData.getData().getPathSegments();
+			String[] parts = paths.get(1).split(":");
+			String storagepath = Environment.getExternalStorageDirectory().getPath() + "/";
+			String path = storagepath + parts[1];
+			if( path != null)
+				resPath.setText( path );
+			resPath.setEnabled(true);
+		}
+		catch(Exception e)
+		{
+			e.printStackTrace();
+		}
+		}
+		resPath.setEnabled(true);
+	}
+
 	public void createShortcut(View view)
 	{
 		Intent intent = new Intent(this, ShortcutActivity.class);
diff --git a/src/in/celest/xash3d/ShortcutActivity.java b/src/in/celest/xash3d/ShortcutActivity.java
index 5679eaac..7c7dd295 100644
--- a/src/in/celest/xash3d/ShortcutActivity.java
+++ b/src/in/celest/xash3d/ShortcutActivity.java
@@ -31,14 +31,17 @@ public class ShortcutActivity extends Activity
 		EditText argv = (EditText)findViewById(R.id.shortcut_cmdArgs);
 		if(argv.length() != 0) intent.putExtra("argv",argv.getText().toString());
 		EditText gamedir = (EditText)findViewById(R.id.shortcut_gamedir);
+		EditText pkgname = (EditText)findViewById(R.id.shortcut_pkgname);
+		if(pkgname.length() != 0) intent.putExtra("gamelibdir", "/data/data/"+pkgname.getText().toString().replace("!","in.celest.xash3d.")+"/lib/");
 		if(gamedir.length() != 0) intent.putExtra("gamedir",gamedir.getText().toString());
 		Intent wrapIntent = new Intent();
 		wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, intent);
 		wrapIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name.getText().toString());
+		
 		Bitmap icon = null;
 		// Try find icon
 		int size = (int) getResources().getDimension(android.R.dimen.app_icon_size);
-		String gamedirstring = getSharedPreferences("engine", 0).getString("basedir","/sdcard/xash/")+(gamedir.length()!=0?gamedir.getText().toString():"valve");
+		String gamedirstring = getSharedPreferences("engine", 0).getString("basedir","/sdcard/xash/")+"/"+(gamedir.length()!=0?gamedir.getText().toString():"valve");
 		try
 		{
 			icon = Bitmap.createScaledBitmap(BitmapFactory.decodeFile(gamedirstring+"/icon.png"), size, size, false);