From ea17bcb5ce8df1b73c171476f8508bbceb525b20 Mon Sep 17 00:00:00 2001
From: akshayaurora <akshayaurora@gmail.com>
Date: Mon, 25 Jul 2016 19:00:44 +0530
Subject: [PATCH] move app dir to `<private_dir>/app` allowing for
 re-installation/updation to not delete the user data. This is only working
 for sdl2 bootstrap, stiil need to test with service and other bootstraps.

---
 .../bootstraps/sdl2/build/jni/src/start.c     |  2 +-
 .../src/org/kivy/android/PythonActivity.java  | 29 +++++++++++++------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/pythonforandroid/bootstraps/sdl2/build/jni/src/start.c b/pythonforandroid/bootstraps/sdl2/build/jni/src/start.c
index 7b40cb73be..dff70235b5 100644
--- a/pythonforandroid/bootstraps/sdl2/build/jni/src/start.c
+++ b/pythonforandroid/bootstraps/sdl2/build/jni/src/start.c
@@ -156,7 +156,7 @@ int main(int argc, char *argv[]) {
   if (dir_exists("lib")) {
     /* If we built our own python, set up the paths correctly */
     LOGP("Setting up python from ANDROID_PRIVATE");
-    PyRun_SimpleString("private = posix.environ['ANDROID_PRIVATE']\n"
+    PyRun_SimpleString("private = posix.environ['ANDROID_PRIVATE'] + '/app'\n"
                        "argument = posix.environ['ANDROID_ARGUMENT']\n"
                        "sys.path[:] = [ \n"
                        "    private + '/lib/python27.zip', \n"
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java
index 02ee0435e2..9a75044e6b 100644
--- a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java
+++ b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java
@@ -48,14 +48,21 @@ public class PythonActivity extends SDLActivity {
     private Bundle mMetaData = null;
     private PowerManager.WakeLock mWakeLock = null;
 
+    public String getKivyRoot() {
+        String kivy_root =  getFilesDir().getAbsolutePath() + "/app";
+        return kivy_root;
+    }
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Log.v(TAG, "My oncreate running");
         resourceManager = new ResourceManager(this);
         this.showLoadingScreen();
+        File kivy_root_file = new File(getKivyRoot());
 
         Log.v(TAG, "Ready to unpack");
-        unpackData("private", getFilesDir());
+        unpackData("private", kivy_root_file);
 
         Log.v(TAG, "About to do super onCreate");
         super.onCreate(savedInstanceState);
@@ -63,14 +70,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
         this.mActivity = this;
 
+        String kivy_root_dir = getKivyRoot();
         String mFilesDirectory = mActivity.getFilesDir().getAbsolutePath();
         Log.v(TAG, "Setting env vars for start.c and Python to use");
         SDLActivity.nativeSetEnv("ANDROID_PRIVATE", mFilesDirectory);
-        SDLActivity.nativeSetEnv("ANDROID_ARGUMENT", mFilesDirectory);
-        SDLActivity.nativeSetEnv("ANDROID_APP_PATH", mFilesDirectory);
+        SDLActivity.nativeSetEnv("ANDROID_ARGUMENT", kivy_root_dir);
+        SDLActivity.nativeSetEnv("ANDROID_APP_PATH", kivy_root_dir);
         SDLActivity.nativeSetEnv("ANDROID_ENTRYPOINT", "main.pyo");
-        SDLActivity.nativeSetEnv("PYTHONHOME", mFilesDirectory);
-        SDLActivity.nativeSetEnv("PYTHONPATH", mFilesDirectory + ":" + mFilesDirectory + "/lib");
+        SDLActivity.nativeSetEnv("PYTHONHOME", kivy_root_dir);
+        SDLActivity.nativeSetEnv("PYTHONPATH", kivy_root_dir + ":" + kivy_root_dir + "/lib");
 
         try {
             Log.v(TAG, "Access to our meta-data...");
@@ -93,7 +101,9 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     public void loadLibraries() {
-        PythonUtil.loadLibraries(getFilesDir());
+        String kivy_root = new String(getKivyRoot());
+        File kivy_root_file = new File(kivy_root);
+        PythonUtil.loadLibraries(kivy_root_file);
     }
 
     public void recursiveDelete(File f) {
@@ -267,11 +277,12 @@ public static void start_service(String serviceTitle, String serviceDescription,
         Intent serviceIntent = new Intent(PythonActivity.mActivity, PythonService.class);
         String argument = PythonActivity.mActivity.getFilesDir().getAbsolutePath();
         String filesDirectory = argument;
+        String kivy_root_dir = PythonActivity.mActivity.getKivyRoot();
         serviceIntent.putExtra("androidPrivate", argument);
-        serviceIntent.putExtra("androidArgument", argument);
+        serviceIntent.putExtra("androidArgument", kivy_root_dir);
         serviceIntent.putExtra("serviceEntrypoint", "service/main.pyo");
-        serviceIntent.putExtra("pythonHome", argument);
-        serviceIntent.putExtra("pythonPath", argument + ":" + filesDirectory + "/lib");
+        serviceIntent.putExtra("pythonHome", kivy_root_dir);
+        serviceIntent.putExtra("pythonPath", kivy_root_dir + ":" + kivy_root_dir + "/lib");
         serviceIntent.putExtra("serviceTitle", serviceTitle);
         serviceIntent.putExtra("serviceDescription", serviceDescription);
         serviceIntent.putExtra("pythonServiceArgument", pythonServiceArgument);