From 54de45e77c828d3d09e6501c1700b10de395ef01 Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Fri, 23 Oct 2015 15:55:53 +0300
Subject: [PATCH] SDL: do not request SD card write access for Android 4.4 and
 above, unless enabled in AndroidAppSettings

---
 changeAppSettings.sh                                  |  2 ++
 project/AndroidManifestTemplate.xml                   | 11 ++++++-----
 .../jni/application/xserver/AndroidAppSettings.cfg    |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index be6dd2032..a8e5afc1e 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -801,6 +801,8 @@ esac
 
 if [ "$AccessSdCard" = "n" ]; then
 	$SEDI "/==EXTERNAL_STORAGE==/ d" project/AndroidManifest.xml
+else
+	$SEDI "/==NOT_EXTERNAL_STORAGE==/ d" project/AndroidManifest.xml
 fi
 
 if [ "$AccessInternet" = "n" ]; then
diff --git a/project/AndroidManifestTemplate.xml b/project/AndroidManifestTemplate.xml
index 124b769c0..693b4e663 100644
--- a/project/AndroidManifestTemplate.xml
+++ b/project/AndroidManifestTemplate.xml
@@ -45,11 +45,12 @@
 	</application>
 
 	<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
-	<!-- ==INTERNET== --> <uses-permission android:name="android.permission.INTERNET"></uses-permission>
-	<!-- ==EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
-	<!-- ==EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"></uses-permission>
-	<!-- ==RECORD_AUDIO== --> <uses-permission android:name="android.permission.RECORD_AUDIO"></uses-permission>
-	<!-- ==ADMOB== --> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
+	<!-- ==INTERNET== --> <uses-permission android:name="android.permission.INTERNET" />
+	<!-- ==EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<!-- ==EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+	<!-- ==NOT_EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" /> <!-- App has write access to it's own dir on SD card without this permission on Android 4.4 and above -->
+	<!-- ==RECORD_AUDIO== --> <uses-permission android:name="android.permission.RECORD_AUDIO" />
+	<!-- ==ADMOB== --> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
 	<!-- <uses-permission android:name="android.permission.VIBRATE"></uses-permission> --> <!-- Vibrator not supported yet by SDL -->
 
diff --git a/project/jni/application/xserver/AndroidAppSettings.cfg b/project/jni/application/xserver/AndroidAppSettings.cfg
index 7c574faed..44f91128f 100644
--- a/project/jni/application/xserver/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver/AndroidAppSettings.cfg
@@ -160,7 +160,7 @@ AppUsesMultitouch=y
 AppRecordsAudio=n
 
 # Application needs to access SD card. If your data files are bigger than 5 Mb, enable it. (y) / (n)
-AccessSdCard=
+AccessSdCard=n
 
 # Application needs Internet access. If you disable it, you'll have to bundle all your data files inside .apk (y) / (n)
 AccessInternet=y