cleanup Android sevice related code

b3b · b3b · commit 95306b7dd92e · 2013-04-24T04:53:03.000+04:00
diff --git a/src/jni/application/python/start.c b/src/jni/application/python/start.c
@@ -163,6 +163,9 @@ JNIEXPORT void JNICALL JAVA_EXPORT_NAME(PythonService_nativeStart) ( JNIEnv*  en
     setenv("PYTHON_SERVICE_ARGUMENT", arg, 1);
 
     char *argv[] = { "service" };
+    /* ANDROID_ARGUMENT points to service subdir,
+     * so main() will run main.py from this dir
+     */
     main(1, argv);
 }
 
diff --git a/src/src/org/renpy/android/PythonService.java b/src/src/org/renpy/android/PythonService.java
@@ -39,8 +39,10 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             Log.v("python service", "service exists, do not start again");
             return START_NOT_STICKY;
         }
+
         Bundle extras = intent.getExtras();
         androidPrivate = extras.getString("androidPrivate");
+        // service code is located in service subdir
         androidArgument = extras.getString("androidArgument") + "/service";
         pythonHome = extras.getString("pythonHome");
         pythonPath = extras.getString("pythonPath");
@@ -73,6 +75,8 @@ public void onDestroy() {
 
     @Override
     public void run(){
+
+        // libraries loading, the same way PythonActivity.run() do
         System.loadLibrary("sdl");
         System.loadLibrary("sdl_image");
         System.loadLibrary("sdl_ttf");
@@ -85,15 +89,15 @@ public void run(){
         System.load(getFilesDir() + "/lib/python2.7/lib-dynload/unicodedata.so");
 
         try {
-        System.loadLibrary("sqlite3");
-        System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_sqlite3.so");
+            System.loadLibrary("sqlite3");
+            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_sqlite3.so");
         } catch(UnsatisfiedLinkError e) {
         }
 
         try {
-        System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_imaging.so");
-        System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_imagingft.so");
-        System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_imagingmath.so");
+            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_imaging.so");
+            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_imagingft.so");
+            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_imagingmath.so");
         } catch(UnsatisfiedLinkError e) {
         }
 

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,9 @@ JNIEXPORT void JNICALL JAVA_EXPORT_NAME(PythonService_nativeStart) ( JNIEnv* en`
`163`	`163`	`setenv("PYTHON_SERVICE_ARGUMENT", arg, 1);`
`164`	`164`
`165`	`165`	`char *argv[] = { "service" };`
	`166`	`+ /* ANDROID_ARGUMENT points to service subdir,`
	`167`	`+ * so main() will run main.py from this dir`
	`168`	`+ */`
`166`	`169`	`main(1, argv);`
`167`	`170`	`}`
`168`	`171`