0-8-15
diff --git a/‎LNCONFIG.h.in‎
Lines changed: 1 addition & 1 deletion b/‎LNCONFIG.h.in‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/DemoAndroidLNjScheme/MODULES‎
Lines changed: 1 addition & 1 deletion b/‎apps/DemoAndroidLNjScheme/MODULES‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/DemoAndroidLNjScheme/lnjstest.scm‎
Lines changed: 0 additions & 1 deletion b/‎apps/DemoAndroidLNjScheme/lnjstest.scm‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎loaders/android/AndroidManifest.xml.in‎
Lines changed: 1 addition & 1 deletion b/‎loaders/android/AndroidManifest.xml.in‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎loaders/android/bootstrap.java.in‎
Lines changed: 34 additions & 2 deletions b/‎loaders/android/bootstrap.java.in‎
Lines changed: 34 additions & 2 deletions
diff --git a/‎make.sh‎
Lines changed: 15 additions & 0 deletions b/‎make.sh‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎modules/camera/ANDROID_java_oncreate‎
Lines changed: 0 additions & 2 deletions b/‎modules/camera/ANDROID_java_oncreate‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎modules/config/config.scm‎
Lines changed: 11 additions & 1 deletion b/‎modules/config/config.scm‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎modules/eventloop/eventloop.scm‎
Lines changed: 8 additions & 5 deletions b/‎modules/eventloop/eventloop.scm‎
Lines changed: 8 additions & 5 deletions
diff --git a/‎modules/gps/ANDROID_java_oncreate‎
Lines changed: 0 additions & 2 deletions b/‎modules/gps/ANDROID_java_oncreate‎
Lines changed: 0 additions & 2 deletions
@@ -1,6 +1,6 @@
 /*
 LambdaNative - a cross-platform Scheme framework
-Copyright (c) 2009-2013, University of British Columbia
+Copyright (c) 2009-2020, University of British Columbia
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or
 
@@ -1 +1 @@
-eventloop ln_glgui lnjscheme webview uiform
+eventloop ln_glgui ln_jscheme webview uiform
@@ -7,4 +7,3 @@
 ;; Just to see an error:
 ;;
 (error "nananana")
-
@@ -22,7 +22,7 @@
     @ANDROID_XML_SERVICES@
     @ANDROID_XML_PROVIDERS@
   </application>
-@ANDROID_XML_PERMISSIONS@
 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+@ANDROID_XML_PERMISSIONS@
 </manifest> 
 # eof
@@ -46,6 +46,8 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.BroadcastReceiver;
 import android.content.res.Configuration;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageInfo;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 import android.os.PowerManager;
@@ -108,6 +110,29 @@ public class @SYS_APPNAME@ extends Activity implements @ANDROID_JAVA_IMPLEMENTS@
     return true;
   }
 
+  public boolean requestAllPermissions() {
+    @IF_ANDROIDAPI_GT_22@
+    PackageManager pm = getPackageManager();
+    try
+    {
+        PackageInfo packageInfo = pm.getPackageInfo(getPackageName(), PackageManager.GET_PERMISSIONS);
+        String[] requestedPermissions = null;
+        if (packageInfo != null)
+            requestedPermissions = packageInfo.requestedPermissions;
+
+        if (requestedPermissions != null && requestedPermissions.length > 0)
+          requestPermissions(requestedPermissions, 1);
+    }
+    catch (PackageManager.NameNotFoundException e)
+    {
+        System.err.print("requestAllPermissions error: " + e);
+        e.printStackTrace(System.err);
+        return false;
+    }
+    /* end of IF_ANDROIDAPI_GT_22 */
+    return true;
+  }
+
   @Override
   public void startActivityForResult(Intent intent, int cont) {
       try {
@@ -131,6 +156,7 @@ public class @SYS_APPNAME@ extends Activity implements @ANDROID_JAVA_IMPLEMENTS@
   @Override
   public void setContentView(android.view.View view) {
     if(current_ContentView != view) {
+      // Note: this is a bit brain dead as it ONLY handles GLSurfaceView
       if(current_ContentView instanceof android.opengl.GLSurfaceView) {
         ((android.opengl.GLSurfaceView)current_ContentView).onPause();
       }
@@ -177,8 +203,13 @@ public class @SYS_APPNAME@ extends Activity implements @ANDROID_JAVA_IMPLEMENTS@
 
     mSensorManager = (SensorManager)getSystemService(Context.SENSOR_SERVICE);
 
-    checkOrRequestPermission(android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
-    // Additions and permissions needed by modules, e.g. gps
+    requestAllPermissions();
+
+    // MUST NOT run before nativeInstanceInit completed
+    // and MUST NOT run before permission checks
+    setContentView(current_ContentView==null ? mGLView : current_ContentView);
+
+    // Additions needed by modules, e.g. gps
     @ANDROID_JAVA_ONCREATE@
 
     // MUST NOT run before nativeInstanceInit completed
@@ -187,6 +218,7 @@ public class @SYS_APPNAME@ extends Activity implements @ANDROID_JAVA_IMPLEMENTS@
     // start EVENT_IDLE
     if(idle_tmScheduleRate > 0) idle_tm.scheduleAtFixedRate(idle_task, 0, idle_tmScheduleRate);
   }
+
   @Override
   protected void onDestroy() {
     setContentView(mGLView);
 
@@ -399,6 +399,20 @@ compile_payload()
   $SYS_RANLIB $tgtlib 2> /dev/null
   assertfile "$tgtlib"
   echo " == $tgtlib"
+  # transfering additonal .so's files
+  if [ "$SYS_PLATFORM" = android ]; then
+    sofilesdir=`locatedir apps/$SYS_APPNAME/android_sos silent`
+    if [ -d "$sofilesdir" ]; then
+      echo " => building additional library files.."
+      ## (cd $sofilesdir; make)
+      # cp -La $sofilesdir $tmpdir
+      env
+      ( export SYS_ROOT SYS_PATH SYS_CXX SYS_PREFIX SYS_CC SYS_GSC APP_ABI=$abi SYS_STRIP SYS_PLATFORM_VARIANT
+        cd $sofilesdir && make SYS_PREFIX=${SYS_PREFIX} INSTALL_DIR=$SYS_PREFIX/lib -r) || exit 1
+    else
+      echo "not building additional .so files"
+    fi
+  fi
   dmsg_make "payload : $tgtlib"
   dmsg_make "leaving compile_payload"
 }
@@ -1099,6 +1113,7 @@ make_setup_target()
   ac_subst SYS_APPVERSIONCODE
   ac_subst SYS_ANDROIDAPI
   ac_subst IF_ANDROIDAPI_GT_22 "`if [ $SYS_ANDROIDAPI -lt 23 ]; then echo '/* IF_ANDROIDAPI_GT_22 commented out:'; else echo '/* IF_ANDROIDAPI_GT_22 active here:*/'; fi`"
+  ac_subst IF_ANDROIDAPI_GT_25 "`if [ $SYS_ANDROIDAPI -lt 26 ]; then echo '/* IF_ANDROIDAPI_GT_25 commented out:'; else echo '/* IF_ANDROIDAPI_GT_25 active here:*/'; fi`"
   ac_subst SYS_ANDROIDSDK
   ac_subst SYS_ANDROIDNDK
   ac_subst SYS_BUILDHASH
 
@@ -94,6 +94,14 @@ end-of-c-declare
 ;; repl and simillar situations.
 (set! ##exit
       (lambda (#!optional (code 0))
+        #;(println port: (current-error-port)
+         (call-with-output-string
+          (lambda (port)
+            (continuation-capture
+             (lambda (cont)
+               (display-exception-in-context code cont port)
+               (display-continuation-backtrace cont port)))))
+         "##exit")
         ((c-lambda (int) void "lambdanative_exit") code)))
 
 (if (not (file-exists? (system-directory)))
@@ -109,7 +117,9 @@ end-of-c-declare
 
 (cond-expand
  (android
-  (define (android-PackageCodePath) ((c-lambda () char-string "android_getPackageCodePath"))))
+  (define android-FilesDir (c-lambda () char-string "android_getFilesDir"))
+  (set! system-appdirectory android-FilesDir)
+  (define android-PackageCodePath (c-lambda () char-string "android_getPackageCodePath")))
  (else #!void))
 
 ;; Gain access to Android app_directory_files and app_code_path
 
@@ -1,6 +1,6 @@
 #|
 LambdaNative - a cross-platform Scheme framework
-Copyright (c) 2009-2016, University of British Columbia
+Copyright (c) 2009-2020, University of British Columbia
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or
@@ -149,9 +149,11 @@ end-of-c-declare
 (define (event-push t x y)
   (set! event:fifo (append event:fifo (list (list t x y)))))
 (define (event-pop)
-  (if (null? event:fifo) #f
+  (if (null? event:fifo)
+      #f
       (let ((ret (car event:fifo)))
-        (set! event:fifo (cdr event:fifo)) ret)))
+        (set! event:fifo (cdr event:fifo))
+        ret)))
 
 (define on-jscm-result
   (let ((mux (make-mutex 'on-jscm-result)))
@@ -200,8 +202,9 @@ end-of-c-declare
          ;; handle potential scaling (running stretched on a device)
          (hook:event t (if app:scale? (fix (* app:xscale x)) x)
                        (if app:scale? (fix (* app:yscale y)) y))
-         )
-      ((fx= t EVENT_JSCM_RESULT) ((on-jscm-result) t x y))
+      )
+      ((fx= t EVENT_JSCM_RESULT)
+       ((on-jscm-result) t x y))
       ((fx= t EVENT_INIT)
         ;; prevent multiple inits
         (if app:mustinit (begin
 
@@ -2,11 +2,9 @@ locationManager = (LocationManager)getSystemService(Context.LOCATION_SERVICE);
 Criteria criteria = new Criteria();
 if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)){ 
   criteria.setAccuracy(Criteria.ACCURACY_FINE);
-  checkOrRequestPermission(android.Manifest.permission.ACCESS_FINE_LOCATION);
 } else {
   criteria.setPowerRequirement(Criteria.POWER_LOW);
   criteria.setAccuracy(Criteria.ACCURACY_COARSE);
-  checkOrRequestPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION);
 }
 provider = locationManager.getBestProvider(criteria, false);
 Location location = locationManager.getLastKnownLocation(provider);
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-eventloop ln_glgui lnjscheme webview uiform`
	`1`	`+eventloop ln_glgui ln_jscheme webview uiform`