From 69f78f4d4e185b4671e877522d1c2eadb12d6726 Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Tue, 7 Oct 2014 23:26:58 +0300
Subject: [PATCH] Updated Debian noroot

---
 changeAppSettings.sh                          |   1 +
 project/java/Settings.java                    |  25 +++++++++++++++++-
 .../xserver-debian/AndroidAppSettings.cfg     |   8 +++---
 .../xserver-debian/AndroidData/update3.tgz    | Bin 0 -> 4962 bytes
 .../jni/application/xserver-debian/xserver    |   2 +-
 todo.txt                                      |   4 ---
 6 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 project/jni/application/xserver-debian/AndroidData/update3.tgz

diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index d382b4dd6..aa21b8a10 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -863,6 +863,7 @@ else
 		echo Patching $F
 		echo '// DO NOT EDIT THIS FILE - it is automatically generated, edit file under $JAVA_SRC_PATH dir' > project/src/$OUT
 		cat $F | sed "s/^package .*;/package $AppFullName;/" >> project/src/$OUT
+		rm -f project/libs/android-support-v4.jar
 	done
 	$SEDI "s/==GOOGLEPLAYGAMESERVICES_APP_ID==/$GooglePlayGameServicesId/g" project/res/values/strings.xml
 	SDK_DIR=`grep '^sdk.dir' project/local.properties | sed 's/.*=//'`
diff --git a/project/java/Settings.java b/project/java/Settings.java
index fa3a34e1e..5d83abf81 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -612,6 +612,7 @@ class Settings
 		nativeSetEnv( "SECURE_STORAGE_DIR", p.getFilesDir().getAbsolutePath() );
 		nativeSetEnv( "DATADIR", Globals.DataDir );
 		nativeSetEnv( "UNSECURE_STORAGE_DIR", Globals.DataDir );
+		SdcardAppPath.setEnv(p);
 		nativeSetEnv( "HOME", Globals.DataDir );
 		nativeSetEnv( "SDCARD", Environment.getExternalStorageDirectory().getAbsolutePath() );
 		nativeSetEnv( "ANDROID_VERSION", String.valueOf(android.os.Build.VERSION.SDK_INT) );
@@ -705,6 +706,14 @@ class Settings
 				return Dummy.Holder.sInstance;
 		}
 		public abstract String path(final Context p);
+		private void setEnvInternal(final Context p)
+		{
+			nativeSetEnv( "UNSECURE_STORAGE_DIR_0", Globals.DataDir );
+		}
+		public static void setEnv(final Context p)
+		{
+			get().setEnvInternal(p);
+		}
 		public String bestPath(final Context p)
 		{
 			return path(p);
@@ -759,11 +768,25 @@ class Settings
 					if( size > maxSize )
 					{
 						maxSize = size;
-						ret = path.getPath();
+						ret = path.getAbsolutePath();
 					}
 				}
 				return ret;
 			};
+			public void setEnvInternal(final Context p)
+			{
+				File[] paths = p.getExternalFilesDirs(null);
+				int index = 0;
+				for( File path: paths )
+				{
+					if( path == null )
+						continue;
+					if( !path.exists() )
+						path.mkdirs();
+					nativeSetEnv( "UNSECURE_STORAGE_DIR_" + index, path.getAbsolutePath() );
+					index++;
+				}
+			}
 		}
 		private static class Dummy extends SdcardAppPath
 		{
diff --git a/project/jni/application/xserver-debian/AndroidAppSettings.cfg b/project/jni/application/xserver-debian/AndroidAppSettings.cfg
index 6f7d350cf..13333887b 100644
--- a/project/jni/application/xserver-debian/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver-debian/AndroidAppSettings.cfg
@@ -7,10 +7,10 @@ AppName="Debian"
 AppFullName=com.cuntubuntu
 
 # Application version code (integer)
-AppVersionCode=141006
+AppVersionCode=141007
 
 # Application user-visible version name (string)
-AppVersionName="14.10.06"
+AppVersionName="14.10.07"
 
 # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
 # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
@@ -18,10 +18,10 @@ AppVersionName="14.10.06"
 # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir -
 # these files are put inside .apk package by build system
 # Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS
-AppDataDownloadUrl="!!System image|:data.tar.gz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/14.05.01/dist-debug-wheezy-proot-<ARCH>.tar.gz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall2.sh^!!Update|:update1.tar.gz:update1.tgz^!!Update|:update2.tar.gz:update2-<ARCH>.tgz"
+AppDataDownloadUrl="!!System image|:data.tar.gz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/14.05.01/dist-debug-wheezy-proot-<ARCH>.tar.gz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall2.sh^!!Update|:update1.tar.gz:update1.tgz^!!Update|:update2.tar.gz:update2-<ARCH>.tgz^!!Update|:update3.tar.gz:update3.tgz"
 
 # Reset SDL config when updating application to the new version (y) / (n)
-ResetSdlConfigForThisVersion=y
+ResetSdlConfigForThisVersion=n
 
 # Delete application data files when upgrading (specify file/dir paths separated by spaces)
 DeleteFilesOnUpgrade="%"
diff --git a/project/jni/application/xserver-debian/AndroidData/update3.tgz b/project/jni/application/xserver-debian/AndroidData/update3.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..a44be9316899e20aa72728fbfffa9bdba1f106fd
GIT binary patch
literal 4962
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
KUW1{6fdK&MR(aF_

literal 0
HcmV?d00001

diff --git a/project/jni/application/xserver-debian/xserver b/project/jni/application/xserver-debian/xserver
index 670f48dfe..38269b698 160000
--- a/project/jni/application/xserver-debian/xserver
+++ b/project/jni/application/xserver-debian/xserver
@@ -1 +1 @@
-Subproject commit 670f48dfe9358e7078119998befe80a88e434977
+Subproject commit 38269b6980bccef6340f9c9f04e6e3ec059d07b0
diff --git a/todo.txt b/todo.txt
index 6c2eccc4d..3a55a5a46 100644
--- a/todo.txt
+++ b/todo.txt
@@ -23,10 +23,6 @@ TODO, which will get actually done
 
 - SDL: sometimes the screen stays black after restoring from background.
 
-- Debian noroot: audio support - implement PulseAudio server.
-
-- Debian noroot: support multiple external storage locations.
-
 - XSDL: support Android intent x11://localhost:6000 - http://www.openintents.org/node/905
 
 - Nvidia Shield D-Pad does not send any events (probably acts as 3-rd joystick).