ANDROID: Fix download error when duplicate scratch.bas files

Author: chrisws

ChangeLog

@@ -1,3 +1,7 @@
+2023-05-12 (12.27)
+	CONSOLE: Fix image save
+	ANDROID: Fix download error when there are duplicate scratch.bas files
+
 2023-03-26 (12.26)
 	ANDROID: Fix setenv error #187
 	ANDROID: update web UI dependencies

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], [12.26])
+AC_INIT([smallbasic], [12.27])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET

src/platform/android/Makefile.am

@@ -31,10 +31,11 @@ ndk-build-release:
 	(cd jni && ${NDK}/ndk-build NDK_DEBUG=0)
 
 release:
-	(./gradlew clean assemble)
+	(./gradlew clean :app:bundle)
 
 library:
 	(./gradlew clean assemble)
 	(mkdir -p dist)
 	(cp -R app/build/intermediates/stripped_native_libs/release/out/lib/ dist)
 	(cp app/build/intermediates/dex/release/minifyReleaseWithR8/classes.dex dist)
+

src/platform/android/app/build.gradle

@@ -11,7 +11,7 @@ android {
     targetSdkVersion 33
     versionCode 59
     versionName '12.26'
-      resConfigs 'en'
+    resConfigs 'en'
   }
 
   signingConfigs {
@@ -59,6 +59,6 @@ android {
 }
 
 dependencies {
-  implementation 'androidx.core:core:1.9.0'
+  implementation 'androidx.core:core:1.10.0'
   testImplementation 'junit:junit:4.13.2'
 }

src/platform/android/app/src/main/assets/main.bas

@@ -120,7 +120,7 @@ sub do_about()
   color colText
   print "Version "; sbver
   print
-  print "Copyright (c) 2002-2022 Chris Warren-Smith"
+  print "Copyright (c) 2002-2023 Chris Warren-Smith"
   print "Copyright (c) 1999-2006 Nicholas Christopoulos" + chr(10)
 
   local bn_home

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

@@ -17,9 +17,11 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.TimeZone;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -424,8 +426,24 @@ private Response handleDownload(Map<String, Collection<String>> data) throws IOE
         // download multiple as zip
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ZipOutputStream zipOutputStream = new ZipOutputStream(outputStream);
+        Set<String> fileNameSet = new HashSet<>();
         for (String fileName : fileNames) {
           Response response = getFile(remoteHost, fileName, false);
+          // de-duplicate the fileName entry to avoid a duplicate entry/zip exception
+          int index = 1;
+          String originalName = fileName;
+          while (fileNameSet.contains(fileName)) {
+            int dot = originalName.lastIndexOf('.');
+            if (dot != -1) {
+              String extension = originalName.substring(dot + 1);
+              String name = originalName.substring(0, dot);
+              fileName = String.format(Locale.ENGLISH, "%s (%d).%s", name, index, extension);
+            } else {
+              fileName = String.format(Locale.ENGLISH, "%s (%d)", originalName, index);
+            }
+            index++;
+          }
+          fileNameSet.add(fileName);
           ZipEntry entry = new ZipEntry(fileName);
           zipOutputStream.putNextEntry(entry);
           response.toStream(zipOutputStream);

src/platform/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.4.2'
+    classpath 'com.android.tools.build:gradle:8.0.1'
   }
 }
 

src/platform/android/gradle.properties

@@ -9,7 +9,10 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 

src/platform/android/webui/package.json

@@ -4,12 +4,12 @@
   "private": true,
   "proxy": "http://localhost:8080", 
   "dependencies": {
-    "@emotion/react": "^11.10.6",
-    "@emotion/styled": "^11.10.6",
-    "@mui/icons-material": "^5.11.11",
-    "@mui/material": "^5.11.14",
-    "@mui/x-data-grid": "^6.0.2",
-    "npm-check-updates": "^16.8.0",
+    "@emotion/react": "^11.11.0",
+    "@emotion/styled": "^11.11.0",
+    "@mui/icons-material": "^5.11.16",
+    "@mui/material": "^5.13.0",
+    "@mui/x-data-grid": "^6.3.1",
+    "npm-check-updates": "^16.10.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-scripts": "5.0.1"