Fix orientation and app path

KeyWeeUsr · KeyWeeUsr · commit 2004698e8b34 · 2016-12-12T11:29:00.000+01:00
basically creating .kivy folder(logs), fetching files with paths relative to main.py and so on. ANDROID_APP_PATH has to be the folder of main.py file.
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java
@@ -23,6 +23,7 @@
 import android.graphics.PixelFormat;
 import android.view.SurfaceHolder;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ApplicationInfo;
 import android.content.Intent;
@@ -79,12 +80,23 @@ protected void onCreate(Bundle savedInstanceState) {
         //
         // Otherwise, we use the public data, if we have it, or the
         // private data if we do not.
+        String app_root_dir = getAppRoot();
         if (getIntent() != null && getIntent().getAction() != null &&
                 getIntent().getAction().equals("org.kivy.LAUNCH")) {
             File path = new File(getIntent().getData().getSchemeSpecificPart());
 
             Project p = Project.scanDirectory(path);
             SDLActivity.nativeSetEnv("ANDROID_ENTRYPOINT", p.dir + "/main.py");
+            SDLActivity.nativeSetEnv("ANDROID_ARGUMENT", p.dir);
+            SDLActivity.nativeSetEnv("ANDROID_APP_PATH", p.dir);
+
+            if (p != null) {
+                if (p.landscape) {
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                } else {
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+                }
+            }
 
             // Let old apps know they started.
             try {
@@ -96,14 +108,13 @@ protected void onCreate(Bundle savedInstanceState) {
             }
         } else {
             SDLActivity.nativeSetEnv("ANDROID_ENTRYPOINT", "main.pyo");
+            SDLActivity.nativeSetEnv("ANDROID_ARGUMENT", app_root_dir);
+            SDLActivity.nativeSetEnv("ANDROID_APP_PATH", app_root_dir);
         }
 
-        String app_root_dir = getAppRoot();
         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", app_root_dir);
-        SDLActivity.nativeSetEnv("ANDROID_APP_PATH", app_root_dir);
         SDLActivity.nativeSetEnv("PYTHONHOME", app_root_dir);
         SDLActivity.nativeSetEnv("PYTHONPATH", app_root_dir + ":" + app_root_dir + "/lib");
         SDLActivity.nativeSetEnv("PYTHONOPTIMIZE", "2");
diff --git a/pythonforandroid/recipes/python2/patches/custom-loader.patch b/pythonforandroid/recipes/python2/patches/custom-loader.patch
@@ -17,8 +17,8 @@
 +
 +    /* Ensure we have access to libpymodules. */
 +    if (libpymodules == -1) {
-+        printf("ANDROID_APP_PATH = %s\n", getenv("ANDROID_APP_PATH"));
-+        PyOS_snprintf(pathbuf, sizeof(pathbuf), "%s/libpymodules.so", getenv("ANDROID_APP_PATH"));
++        printf("ANDROID_PRIVATE = %s\n", getenv("ANDROID_PRIVATE"));
++        PyOS_snprintf(pathbuf, sizeof(pathbuf), "%s/app/libpymodules.so", getenv("ANDROID_PRIVATE"));
 +        libpymodules = dlopen(pathbuf, RTLD_NOW);
 +
 +        if (libpymodules == NULL) {
diff --git a/testapps/testlauncher_setup/sdl2.py b/testapps/testlauncher_setup/sdl2.py
@@ -7,8 +7,8 @@
                    'requirements': (
                         'python2,sdl2,android,'
                         'sqlite3,docutils,pygments,kivy,pyjnius,plyer,'
-                        'cymunk,lxml,pil,'  # audiostream, ffmpeg, openssl,
-                        'twisted,numpy'),  # pyopenssl
+                        'cymunk,lxml,pil,openssl,pyopenssl,'
+                        'twisted'),  # audiostream, ffmpeg, numpy
                    'android-api': 14,
                    'dist-name': 'launchertest_sdl2',
                    'name': 'TestLauncher-sdl2',

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`+`
`18`	`18`	`+ /* Ensure we have access to libpymodules. */`
`19`	`19`	`+ if (libpymodules == -1) {`
`20`		`-+ printf("ANDROID_APP_PATH = %s\n", getenv("ANDROID_APP_PATH"));`
`21`		`-+ PyOS_snprintf(pathbuf, sizeof(pathbuf), "%s/libpymodules.so", getenv("ANDROID_APP_PATH"));`
	`20`	`++ printf("ANDROID_PRIVATE = %s\n", getenv("ANDROID_PRIVATE"));`
	`21`	`++ PyOS_snprintf(pathbuf, sizeof(pathbuf), "%s/app/libpymodules.so", getenv("ANDROID_PRIVATE"));`
`22`	`22`	`+ libpymodules = dlopen(pathbuf, RTLD_NOW);`
`23`	`23`	`+`
`24`	`24`	`+ if (libpymodules == NULL) {`