Merge pull request #80 from chrisws/0_12_15

0 12 15

Author: chrisws

ChangeLog

@@ -1,3 +1,17 @@
+2019-08-23 (0.12.15)
+	ANDROID: fix ChromeOS crash when restarting over existing instance
+
+2019-08-19 (0.12.15)
+	ANDROID: fix issue with crash on minimise with ChromeOS
+	ANDROID: fix permission issue with share command
+	ANDROID: (internal) update to androidx
+
+2019-07-27 (0.12.15)
+	SDL: added -n command line option to run then not pause for back key
+
+2019-07-10 (0.12.15)
+	SDL: update editor find and replace
+
 2019-06-27 (0.12.15)
 	FLTK: file file save as
 	UI: fix reported crash in android printing null

configure.ac

@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [0.12.15])
+AC_INIT([smallbasic], [0.12.16])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
@@ -344,7 +344,7 @@ function buildFLTK() {
 
    FLTK_CXXFLAGS="${PACKAGE_CFLAGS} `fltk-config --cxxflags`"
    FLTK_CXXFLAGS="${FLTK_CXXFLAGS} -fno-exceptions -fno-rtti -std=c++11 -Wno-unknown-pragmas"
-   PACKAGE_LIBS="${PACKAGE_LIBS} `fltk-config --ldstaticflags --use-images` -no-pie"
+   PACKAGE_LIBS="${PACKAGE_LIBS} `fltk-config --ldstaticflags --use-images`"
 
    dnl do not depend on cygwin.dll under cygwin build
    case "${host_os}" in
@@ -354,9 +354,14 @@ function buildFLTK() {
      AC_DEFINE(_Win32, 1, [Windows build])
      ;;
 
+     *darwin*)
+     (cd images && xxd -i sb-desktop-128x128.png > ../src/platform/fltk/icon.h)
+     ;;
+
      *)
      (cd images && xxd -i sb-desktop-128x128.png > ../src/platform/fltk/icon.h)
-     xxd
+     PACKAGE_LIBS="${PACKAGE_LIBS} -no-pie"
+     ;;
    esac
 
    defaultConditionals

debian/changelog

@@ -1,3 +1,8 @@
+smallbasic (0.12.16) unstable; urgency=low
+  * Various see web site
+
+ -- Chris Warren-Smith <[email protected]>  Fri, 25 Aug 2019 09:45:25 +1000
+
 smallbasic (0.12.15) unstable; urgency=low
   * Various see web site
 

src/platform/android/app/build.gradle

@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
 
 android {
   // app can use the API features included in this API level and lower.
-  compileSdkVersion 27
+  compileSdkVersion 28
 
   // can override some attributes in main/AndroidManifest.xml
   defaultConfig {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 16
-    targetSdkVersion 27
-    versionCode 36
-    versionName "0.12.15.3"
+    targetSdkVersion 28
+    versionCode 38
+    versionName "0.12.16"
     resConfigs "en"
   }
 
@@ -47,6 +47,6 @@ android {
 }
 
 dependencies {
-  implementation 'com.android.support:support-compat:27.1.1'
+  implementation 'androidx.core:core:1.0.2'
   testImplementation 'junit:junit:4.12'
 }

src/platform/android/app/src/main/AndroidManifest.xml

@@ -52,6 +52,15 @@
         <data android:scheme="smallbasic" />
       </intent-filter>
     </activity>
+    <provider
+      android:name="androidx.core.content.FileProvider"
+      android:authorities="net.sourceforge.smallbasic.provider"
+      android:exported="false"
+      android:grantUriPermissions="true">
+      <meta-data
+        android:name="android.support.FILE_PROVIDER_PATHS"
+        android:resource="@xml/file_paths"/>
+    </provider>
   </application>
   <!-- Permissions -->
   <uses-permission android:name="android.permission.INTERNET" />

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java

@@ -24,9 +24,6 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.util.Base64;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -46,11 +43,15 @@
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.Inet4Address;
 import java.net.InetAddress;
@@ -72,6 +73,11 @@
 import java.util.concurrent.Semaphore;
 import java.util.zip.GZIPInputStream;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
+
 /**
  * Extends NativeActivity to provide interface methods for runtime.cpp
  *
@@ -539,7 +545,8 @@ public void share(final byte[] pathBytes) {
       Intent sendIntent = new Intent();
       sendIntent.setAction(Intent.ACTION_SEND);
       sendIntent.putExtra(Intent.EXTRA_TEXT, buffer);
-      sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
+      sendIntent.putExtra(Intent.EXTRA_STREAM, getSharedFile(file));
+      sendIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
       sendIntent.putExtra(Intent.EXTRA_SUBJECT, file.getName());
       sendIntent.setType("text/plain");
       startActivity(Intent.createChooser(sendIntent, "Share"));
@@ -669,6 +676,24 @@ public void run() {
     });
   }
 
+  private void copy(File src, File dst) throws IOException {
+    InputStream in = new FileInputStream(src);
+    try {
+      OutputStream out = new FileOutputStream(dst);
+      try {
+        byte[] buf = new byte[1024];
+        int len;
+        while ((len = in.read(buf)) > 0) {
+          out.write(buf, 0, len);
+        }
+      } finally {
+        out.close();
+      }
+    } finally {
+      in.close();
+    }
+  }
+
   private String execBuffer(final String buffer, final String name, boolean run) throws IOException {
     File outputFile = getApplication().getFileStreamPath(name);
     BufferedWriter output = new BufferedWriter(new FileWriter(outputFile));
@@ -773,6 +798,23 @@ private Map<String, String> getPostData(DataInputStream inputStream, final Strin
     return result;
   }
 
+  private Uri getSharedFile(File file) {
+    Uri result;
+    try {
+      File sharesPath = new File(getExternalFilesDir(null), "shares");
+      if (sharesPath.mkdirs()) {
+        Log.i(TAG, "created folder: " + sharesPath.toString());
+      }
+      File shareFile = new File(sharesPath, file.getName());
+      copy(file, sharesPath);
+      result = FileProvider.getUriForFile(this, "net.sourceforge.smallbasic.provider", shareFile);
+    } catch (Exception e) {
+      result = null;
+      Log.e(TAG, "failed to create shared file", e);
+    }
+    return result;
+  }
+
   private String getString(final byte[] promptBytes) {
     try {
       return new String(promptBytes, CP1252);

src/platform/android/app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,3 @@
+<paths>
+  <external-files-path name="shares" path="shares/" />
+</paths>

src/platform/android/build.gradle

@@ -5,8 +5,8 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.2'
-    classpath "com.github.ben-manes:gradle-versions-plugin:0.20.0"
+    classpath 'com.android.tools.build:gradle:3.5.0'
+    classpath "com.github.ben-manes:gradle-versions-plugin:0.22.0"
   }
 }
 

src/platform/android/gradle.properties

@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

src/platform/android/jni/display.cpp

@@ -143,7 +143,7 @@ bool Graphics::construct(int fontId) {
     if (_screen && _screen->create(_w, _h)) {
       _drawTarget = _screen;
       maSetColor(DEFAULT_BACKGROUND);
-      ANativeWindow_setBuffersGeometry(_app->window, 0, 0, WINDOW_FORMAT_RGBA_8888);
+      ANativeWindow_setBuffersGeometry(_app->window, 0, 0, AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM);
       result = true;
     } else {
       trace("Failed to create canvas");
@@ -157,18 +157,27 @@ bool Graphics::construct(int fontId) {
 void Graphics::redraw() {
   if (_app->window != NULL && !_paused) {
     ANativeWindow_Buffer buffer;
-    if (ANativeWindow_lock(_app->window, &buffer, NULL) < 0) {
+    bool locked = ANativeWindow_lock(_app->window, &buffer, NULL) == 0;
+    if (!locked) {
       trace("Unable to lock window buffer");
     } else {
-      void *pixels = buffer.bits;
-      int width = MIN(_w, MIN(buffer.width, _screen->_w));
-      int height = MIN(_h, MIN(buffer.height, _screen->_h));
-      for (int y = 0; y < height; y++) {
-        pixel_t *line = _screen->getLine(y);
-        memcpy((pixel_t *)pixels, line, width * sizeof(pixel_t));
-        pixels = (pixel_t*)pixels + buffer.stride;
+      if (buffer.format != AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM) {
+        ANativeWindow_unlockAndPost(_app->window);
+        ANativeWindow_setBuffersGeometry(_app->window, 0, 0, AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM);
+        locked = ANativeWindow_lock(_app->window, &buffer, NULL) == 0;
+        trace("Restore format %d", locked);
+      }
+      if (locked) {
+        void *pixels = buffer.bits;
+        int width = MIN(_w, MIN(buffer.width, _screen->_w));
+        int height = MIN(_h, MIN(buffer.height, _screen->_h));
+        for (int y = 0; y < height; y++) {
+          pixel_t *line = _screen->getLine(y);
+          memcpy((pixel_t *)pixels, line, width * sizeof(pixel_t));
+          pixels = (pixel_t*)pixels + buffer.stride;
+        }
+        ANativeWindow_unlockAndPost(_app->window);
       }
-      ANativeWindow_unlockAndPost(_app->window);
     }
   }
 }