From 585979c99587e47e06dd540675830e718376c327 Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Fri, 1 Mar 2024 12:41:13 +0000
Subject: [PATCH 01/13] MakeCode - support for hex file import

---
 .../microbit/ui/activity/MakeCodeWebView.java | 90 +++++++++++++++++++
 .../microbit/ui/activity/ProjectActivity.java | 36 ++++++++
 .../com/samsung/microbit/utils/BLEPair.java   |  2 +-
 3 files changed, 127 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java b/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java
index 124085e0..8858fc48 100644
--- a/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java
+++ b/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java
@@ -6,6 +6,8 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Base64;
 import android.util.Log;
 import android.view.View;
@@ -228,6 +230,12 @@ else if ( !hexName.isEmpty()) {
 
         //Check parameters Before load
         Intent intent = getIntent();
+
+        importHex = intent.getStringExtra("importHex");
+        importName = intent.getStringExtra("importName");
+
+        importInitialise();
+
         webView.loadUrl(makecodeUrl);
     } // onCreate
 
@@ -300,6 +308,88 @@ void openProjectActivity() {
         i.setData(hexToFlash);
         startActivity(i);
     }
+
+    private static String importHex  = null;
+    private static String importName = null;
+    private boolean importPosting = false;
+    Handler importHandler = null;
+
+    private void importInitialise() {
+        if ( importHex != null) {
+            importHex = importHex.replaceAll("\r\n", "\\\\n");
+            importHex = importHex.replaceAll("\r", "\\\\n");
+            importHex = importHex.replaceAll("\n", "\\\\n");
+
+            //TODO - does MakeCode signal when ready?
+            Looper looper = Looper.getMainLooper();
+            importHandler = new Handler(looper);
+            importHandler.postDelayed(importCallback, 1000);
+        }
+    }
+    private final Runnable importCallback = new Runnable() {
+        @Override
+        public void run() {
+            if ( importHex != null) {
+                importPostMessage();
+                importHandler.postDelayed( importCallback, 1000);
+            } else {
+                importHandler.removeCallbacks( importCallback);
+                importHandler = null;
+            }
+        }
+    };
+
+    public void importPostMessage() {
+        if ( importHex == null) {
+            return;
+        }
+        if ( importPosting) {
+            return;
+        }
+        if ( webView == null) {
+            return;
+        }
+        if ( importName == null || importName.isEmpty()) {
+            importName = "import.hex";
+        }
+
+        importPosting = true;
+
+        String nl = "\n";
+        String script = "javascript:(";
+        script += nl + "function f() { ";
+        script += nl +   "var ret = 'OK'";
+        script += nl +   "try {";
+        script += nl +     "var loading = document.getElementById('loading')";
+        script += nl +     "if ( loading && loading.parentElement) {";
+        script += nl +       "ret = 'loading'";
+        script += nl +     "} else {";
+        script += nl +       "var name = \"" + importName + "\"";
+        script += nl +       "var hex = \"" + importHex + "\"";
+        script += nl +       "var msg = {";
+        script += nl +         "type: 'importfile',";
+        script += nl +         "filename: name,";
+        script += nl +         "parts: [ hex ]";
+        script += nl +       "}";
+        script += nl +       "window.postMessage( msg, '*')";
+        script += nl +     "}";
+        script += nl +   "} catch( err) {";
+        script += nl +     "ret = err.message";
+        script += nl +   "}";
+        script += nl +   "return ret;";
+        script += nl + "}";
+        script += nl + ")()";
+        webView.evaluateJavascript( script, new ValueCallback<String>() {
+            @Override
+            public void onReceiveValue(String s) {
+                Log.d(TAG, s);
+                if ( s != "loading") {
+                    importHex = null;
+                }
+            }
+        });
+        importPosting = false;
+   }
 }
 
 /* Javascript Interface */
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
index 2267c5b8..b3b022c6 100644
--- a/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
+++ b/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
@@ -66,6 +66,7 @@
 import com.samsung.microbit.utils.Utils;
 import com.samsung.microbit.utils.irmHexUtils;
 
+import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -2554,4 +2555,39 @@ private int scriptsExportSave( Uri uri) {
         }
         return ok ? 0 : 1;
     }
+
+    public void makecodeEditProject(final Project project) {
+        File file = new File( project.filePath);
+        makecodeEditFile( file);
+    }
+
+    private void makecodeEditFile( File file) {
+        String hex = readHexFileToString( file);
+        makecodeEditHex( hex, file.getName());
+    }
+
+    private void makecodeEditHex( String hex, String name) {
+        Intent launchMakeCodeIntent = new Intent(this, MakeCodeWebView.class);
+        if ( !hex.isEmpty()) {
+            launchMakeCodeIntent.putExtra("importHex", hex);
+            launchMakeCodeIntent.putExtra("importName", name);
+        }
+        startActivity(launchMakeCodeIntent);
+    }
+
+    private String readHexFileToString( File file) {
+        String hex = "";
+
+        int size = (int) file.length();
+        byte[] bytes = new byte[size];
+        try {
+            BufferedInputStream buf = new BufferedInputStream( new FileInputStream(file));
+            buf.read(bytes, 0, bytes.length);
+            buf.close();
+            hex = new String( bytes);
+        } catch (Exception e) {
+            hex = "";
+        }
+        return hex;
+    }
 }
diff --git a/app/src/main/java/com/samsung/microbit/utils/BLEPair.java b/app/src/main/java/com/samsung/microbit/utils/BLEPair.java
index ffd13608..00924549 100644
--- a/app/src/main/java/com/samsung/microbit/utils/BLEPair.java
+++ b/app/src/main/java/com/samsung/microbit/utils/BLEPair.java
@@ -103,7 +103,7 @@ public interface BLEPairCallback {
     public BLEPair( BLEPairCallback callback) {
         super();
         paramCallback = callback;
-        mainLooperHandler = new Handler( Looper.getMainLooper());;
+        mainLooperHandler = new Handler( Looper.getMainLooper());
     }
 
     public void stopScanAndPair() {

From b3c7ab7b498e311e0214e9e857568bd6004f0d43 Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:40:38 +0000
Subject: [PATCH 02/13] Projects - add edit project button

---
 .../microbit/ui/adapter/ProjectAdapter.java   | 18 +++++++++++++
 app/src/main/res/drawable/black_btn.xml       | 27 +++++++++++++++++++
 .../layout/custom_project_items_button.xml    |  2 +-
 .../res/layout/custom_project_items_edit.xml  | 27 +++++++++++++++++++
 app/src/main/res/layout/project_items.xml     |  3 +++
 app/src/main/res/values/colors.xml            |  3 +++
 app/src/main/res/values/strings.xml           |  2 ++
 app/src/main/res/values/styles.xml            |  8 ++++++
 8 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/black_btn.xml
 create mode 100644 app/src/main/res/layout/custom_project_items_edit.xml

diff --git a/app/src/main/java/com/samsung/microbit/ui/adapter/ProjectAdapter.java b/app/src/main/java/com/samsung/microbit/ui/adapter/ProjectAdapter.java
index 9611e4f3..c3d44c55 100644
--- a/app/src/main/java/com/samsung/microbit/ui/adapter/ProjectAdapter.java
+++ b/app/src/main/java/com/samsung/microbit/ui/adapter/ProjectAdapter.java
@@ -292,6 +292,18 @@ public void onClick(View v) {
         }
     };
 
+    /**
+     * Occurs when a user clicks on the Flash button on some project item.
+     * Sends clicked project to flash to a micro:bit board.
+     */
+    private View.OnClickListener editBtnClickListener = new View.OnClickListener() {
+
+        @Override
+        public void onClick(View v) {
+            logi("editBtnClickListener() :: ");
+        }
+    };
+
     /**
      * Occurs when a user clicks on the Delete button on some project item.
      * Shows a dialog window to confirm deletion.
@@ -404,6 +416,12 @@ public View getView(int position, View convertView, ViewGroup parent) {
         sendBtnLayout.setTag(position);
         sendBtnLayout.setOnClickListener(sendBtnClickListener);
 
+        TextView editBtnText = (TextView) convertView.findViewById(R.id.project_edit_text);
+        editBtnText.setTypeface(MBApp.getApp().getRobotoTypeface());
+        LinearLayout editBtnLayout = (LinearLayout) convertView.findViewById(R.id.editBtn);
+        editBtnLayout.setTag(position);
+        editBtnLayout.setOnClickListener(editBtnClickListener);
+
         ImageButton deleteBtn = (ImageButton) convertView.findViewById(R.id.deleteBtn);
         deleteBtn.setTag(position);
         deleteBtn.setOnClickListener(deleteBtnClickListener);
diff --git a/app/src/main/res/drawable/black_btn.xml b/app/src/main/res/drawable/black_btn.xml
new file mode 100644
index 00000000..d06b8144
--- /dev/null
+++ b/app/src/main/res/drawable/black_btn.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/black_button_down" />
+            <stroke android:width="1dp" android:color="@color/black_button_down" />
+            <corners android:radius="@dimen/button_background_radius" />
+            <padding
+                android:bottom="@dimen/button_background_padding"
+                android:left="@dimen/button_background_padding"
+                android:right="@dimen/button_background_padding"
+                android:top="@dimen/button_background_padding" />
+        </shape>
+    </item>
+    <item android:state_pressed="false">
+        <shape>
+            <solid android:color="@color/black_button_up" />
+            <stroke android:width="1dp" android:color="@color/black_button_up" />
+            <corners android:radius="@dimen/button_background_radius" />
+            <padding
+                android:bottom="@dimen/button_background_padding"
+                android:left="@dimen/button_background_padding"
+                android:right="@dimen/button_background_padding"
+                android:top="@dimen/button_background_padding" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_project_items_button.xml b/app/src/main/res/layout/custom_project_items_button.xml
index cecca554..096aca6f 100644
--- a/app/src/main/res/layout/custom_project_items_button.xml
+++ b/app/src/main/res/layout/custom_project_items_button.xml
@@ -7,7 +7,7 @@
     android:layout_height="@dimen/project_item_buttons_size"
     android:layout_marginEnd="@dimen/custom_button_end_margin"
     android:layout_marginStart="@dimen/custom_button_start_margin"
-    android:layout_weight="1"
+    android:layout_weight="2"
     android:background="@drawable/blue_btn"
 
     tools:showIn="@layout/project_items">
diff --git a/app/src/main/res/layout/custom_project_items_edit.xml b/app/src/main/res/layout/custom_project_items_edit.xml
new file mode 100644
index 00000000..fbda9194
--- /dev/null
+++ b/app/src/main/res/layout/custom_project_items_edit.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/editBtn"
+    android:gravity="center"
+    android:layout_width="0dp"
+    android:layout_height="@dimen/project_item_buttons_size"
+    android:layout_marginEnd="@dimen/custom_button_end_margin"
+    android:layout_marginStart="@dimen/custom_button_start_margin"
+    android:layout_weight="1"
+    android:background="@drawable/black_btn"
+
+    tools:showIn="@layout/project_items">
+
+    <ImageView
+        style="@style/custom_button_image"
+        android:contentDescription="@string/desc_edit_project_btn"
+        android:src="@drawable/ic_create_code" />
+
+    <TextView
+        android:id="@+id/project_edit_text"
+        style="@style/edit_project_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:text="@string/edit" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/project_items.xml b/app/src/main/res/layout/project_items.xml
index 07f4e4ea..c7cee98a 100644
--- a/app/src/main/res/layout/project_items.xml
+++ b/app/src/main/res/layout/project_items.xml
@@ -40,6 +40,9 @@
         <!-- Flash button -->
         <include layout="@layout/custom_project_items_button" />
 
+        <!-- Edit button -->
+        <include layout="@layout/custom_project_items_edit" />
+
         <!-- Delete button -->
         <ImageButton
             android:id="@+id/deleteBtn"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 292604a2..b74a2e26 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -27,6 +27,9 @@
     <color name="blue_button_up">#3bddff</color>
     <color name="blue_button_flash">#1CC6FD</color>
     <color name="blue_button_down">#37abff</color>
+    <color name="black_button_up">#000000</color>
+    <color name="black_button_flash">#101010</color>
+    <color name="black_button_down">#101010</color>
     <color name="progress_bar_progressed">#16cffd</color>
     <color name="progress_bar_not_progressed">#333333</color>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 83110298..63248c67 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -385,6 +385,8 @@
     <string name="v2_button_label">V2</string>
 
     <string name="no_longer_required_to_connect">It is no longer necessary to connect to your micro:bit before flashing</string>
+    <string name="desc_edit_project_btn">Edit project</string>
+    <string name="edit">Edit</string>
 
 </resources>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bc9c15e5..ce478135 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -106,6 +106,14 @@
         <item name="android:textAppearance">?android:textAppearance</item>
     </style>
 
+    <!-- Edit project button -->
+    <style name="edit_project_text">
+        <item name="android:textSize">@dimen/p1_font_size</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textAppearance">?android:textAppearance</item>
+    </style>
+
     <style name="custom_button_image">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>

From e9cdfee05f39f88e9e171b07f020b9f40b20d407 Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:44:08 +0000
Subject: [PATCH 03/13] FileUtils - move file read/write code into FileUtils

---
 .../com/samsung/microbit/utils/FileUtils.java | 284 ++++++++++++++++++
 1 file changed, 284 insertions(+)

diff --git a/app/src/main/java/com/samsung/microbit/utils/FileUtils.java b/app/src/main/java/com/samsung/microbit/utils/FileUtils.java
index 7ccbbcaf..97429ca4 100644
--- a/app/src/main/java/com/samsung/microbit/utils/FileUtils.java
+++ b/app/src/main/java/com/samsung/microbit/utils/FileUtils.java
@@ -1,16 +1,27 @@
 package com.samsung.microbit.utils;
 
+import android.content.Context;
 import android.content.res.Resources;
+import android.database.Cursor;
+import android.net.Uri;
 import android.os.Environment;
+import android.provider.DocumentsContract;
 import android.util.Log;
 
 import com.samsung.microbit.MBApp;
 import com.samsung.microbit.data.constants.FileConstants;
 
 import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.URLDecoder;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -19,6 +30,7 @@
  * file operations, such as file renaming, deleting and etc.
  */
 public class FileUtils {
+    private static final String TAG = FileUtils.class.getSimpleName();
 
     /**
      * Represents common results of rename operation.
@@ -110,4 +122,276 @@ public static String getFileSize(String filePath) {
         }
         return size;
     }
+
+    public static String fileNameFromPath( String fullPathOfFile) {
+        String[] path = fullPathOfFile.split("/");
+        if ( path.length > 0) {
+            String name = path[ path.length - 1];
+            if ( name.endsWith(".hex")) {
+                return name;
+            }
+        }
+        return null;
+    }
+
+    public static String fileNameFromUri(Uri uri, Context ctx) {
+        if (uri != null) {
+            String scheme = uri.getScheme();
+            if ( scheme != null && scheme.equals("file")) {
+                String encodedPath = uri.getEncodedPath();
+                if (encodedPath != null) {
+                    String fullPathOfFile = URLDecoder.decode(encodedPath);
+                    if (fullPathOfFile != null) {
+                        return fileNameFromPath( fullPathOfFile);
+                    }
+                }
+            } else if ( scheme != null && scheme.equals("content")) {
+                Cursor cursor = ctx.getContentResolver().query( uri, null, null, null, null);
+                if ( cursor != null)
+                {
+                    if ( cursor.moveToFirst()) {
+                        int index = cursor.getColumnIndex(DocumentsContract.Document.COLUMN_DISPLAY_NAME);
+                        if ( index >= 0) {
+                            String name = cursor.getString( index);
+                            cursor.close();
+                            return name;
+                        }
+                    }
+                    cursor.close();
+                }
+            } else {
+                Log.e( TAG, "Unsupported scheme " + scheme);
+            }
+        }
+        return null;
+    }
+
+    public static long fileSizeFromUri( Uri uri, Context ctx) {
+        if (uri != null) {
+            String scheme = uri.getScheme();
+            if ( scheme != null && scheme.equals("file")) {
+                String path = uri.getPath();
+                if ( path != null) {
+                    File file = new File(path);
+                    return file.length();
+                }
+            } else if ( scheme != null && scheme.equals("content")) {
+                Cursor cursor = ctx.getContentResolver().query( uri, null, null, null, null);
+                if ( cursor != null)
+                {
+                    if ( cursor.moveToFirst()) {
+                        int index = cursor.getColumnIndex(DocumentsContract.Document.COLUMN_SIZE);
+                        if ( index >= 0) {
+                            long size = cursor.getLong( index);
+                            cursor.close();
+                            return size;
+                        }
+                    }
+                    cursor.close();
+                }
+            } else {
+                Log.e( TAG, "Unsupported scheme " + scheme);
+            }
+        }
+        return -1;
+    }
+
+    public static byte[] readBytesFromInputStream(InputStream is, final int size) {
+        byte[] bytes = null;
+        try {
+            bytes = new byte[size];
+            int remain = size;
+            int offset = 0;
+            while ( remain > 0) {
+                int read = is.read( bytes, offset, remain);
+                remain -= read;
+                offset += read;
+            }
+        }  catch ( Exception e){
+            bytes = null;
+        }
+        return bytes;
+    }
+
+    public static byte[] readBytesFromFile( File file) {
+        byte[] bytes = null;
+        try {
+            FileInputStream is = new FileInputStream( file);
+            int size = (int) file.length();
+            bytes = readBytesFromInputStream(is, size);
+            is.close();
+        }  catch ( Exception e){
+            bytes = null;
+        }
+        return bytes;
+    }
+
+    public static byte[] readBytesFromUri( Uri uri, Context ctx) {
+        byte[] bytes = null;
+        try {
+            InputStream is = ctx.getContentResolver().openInputStream( uri);
+            if ( is != null) {
+                int size = (int) fileSizeFromUri( uri, ctx);
+                bytes = readBytesFromInputStream( is, size);
+                is.close();
+            }
+        }  catch ( Exception e){
+            bytes = null;
+        }
+        return bytes;
+    }
+
+
+    public static boolean stringBuilderAddStream( StringBuilder sb, InputStream is) {
+        boolean ok = true;
+        try {
+            BufferedReader reader = new BufferedReader( new InputStreamReader( is));
+            try {
+                while (true) {
+                    String line = reader.readLine();
+                    if ( line == null) break;
+                    sb.append( line);
+                    sb.append("\n");
+                }
+            } catch ( Exception e) {
+                ok = false;
+            }
+            reader.close();
+        } catch ( Exception e) {
+            ok = false;
+        }
+        return true;
+    }
+
+    public static boolean stringBuilderAddFile( StringBuilder sb, File file) {
+        boolean ok = false;
+        try {
+            FileInputStream is = new FileInputStream( file);
+            ok = stringBuilderAddStream( sb, is);
+            is.close();
+        } catch ( Exception e) {
+            ok = false;
+        }
+        return ok;
+    }
+
+    public static boolean stringBuilderAddUri( StringBuilder sb, Uri uri, Context ctx) {
+        boolean ok = false;
+        try {
+            InputStream is = ctx.getContentResolver().openInputStream( uri);
+            if ( is != null) {
+                ok = stringBuilderAddStream(sb, is);
+                is.close();
+            }
+        } catch ( Exception e) {
+            ok = false;
+        }
+        return ok;
+    }
+
+    public static String readStringFromHexFile( File file) {
+        String hex = "";
+        StringBuilder sb = new StringBuilder();
+        if ( !stringBuilderAddFile(sb, file))
+            return null;
+        return sb.toString();
+    }
+
+    public static String readStringFromHexUri( Uri uri, Context ctx) {
+        String hex = "";
+        StringBuilder sb = new StringBuilder();
+        if ( !stringBuilderAddUri(sb, uri, ctx))
+            return null;
+        return sb.toString();
+    }
+
+    public static boolean writeBytesToOutputStream( OutputStream os, byte [] bytes)
+    {
+        boolean ok = true;
+
+        try {
+            os.write( bytes);
+            os.flush();
+        } catch ( Exception e) {
+            ok = false;
+        }
+        return ok;
+    }
+
+    public static boolean writeBytesToFile( File file, byte [] bytes)
+    {
+        boolean ok = true;
+
+        try {
+            if ( file.exists()) {
+                file.delete();
+            }
+            file.createNewFile();
+
+            FileOutputStream os = new FileOutputStream(file);
+            ok = writeBytesToOutputStream( os, bytes);
+            os.close();
+        } catch ( Exception e) {
+            ok = false;
+        }
+        return ok;
+    }
+
+    public static boolean writeBytesToUri( Uri uri, byte [] bytes, Context ctx)
+    {
+        boolean ok = true;
+
+        try {
+            OutputStream os = ctx.getContentResolver().openOutputStream( uri);;
+            ok = writeBytesToOutputStream( os, bytes);
+            os.close();
+        } catch ( Exception e) {
+            ok = false;
+        }
+        return ok;
+    }
+
+    public static boolean isHex( byte [] bytes) {
+        boolean ok = true;
+        boolean found = false;
+        for ( int i = 0; !found && i < 1024 && i < bytes.length - 1; i++) {
+            if ( bytes[i] == '\n' && bytes[ i + 1] == ':') {
+                found = true;
+            }
+        }
+        if ( !found) {
+            return false;
+        }
+        try {
+            BufferedReader reader = new BufferedReader( new InputStreamReader( new ByteArrayInputStream( bytes)));
+            String line = null;
+            while ( ok) {
+                line = reader.readLine();
+                if ( line == null) {
+                    break;
+                }
+                if ( !line.isEmpty()) {
+                    if ( !line.startsWith(":")) {
+                        ok = false;
+                    } else {
+                        byte[] hex = line.getBytes();
+                        int chk = irmHexUtils.lineCheck( hex,0);
+                        if ( chk < 0) {
+                            ok = false;
+                        } else {
+                            int sum = irmHexUtils.calcSum( hex,0);
+                            sum = ( chk + sum) % 256;
+                            if ( sum != 0 ) {
+                                ok = false;
+                            }
+                        }
+                    }
+                }
+
+            }          reader.close();
+        } catch (IOException e) {
+            return false;
+        }
+        return ok;
+    }
 }

From bf283393af26887ae0a1695bf3f1d4c9c3a92352 Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:47:17 +0000
Subject: [PATCH 04/13] ProjectsHelper - helper functions fer import

---
 .../microbit/utils/ProjectsHelper.java        | 120 ++++++++++++++++++
 1 file changed, 120 insertions(+)

diff --git a/app/src/main/java/com/samsung/microbit/utils/ProjectsHelper.java b/app/src/main/java/com/samsung/microbit/utils/ProjectsHelper.java
index 9643ded9..76ae2f0f 100644
--- a/app/src/main/java/com/samsung/microbit/utils/ProjectsHelper.java
+++ b/app/src/main/java/com/samsung/microbit/utils/ProjectsHelper.java
@@ -5,9 +5,13 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
+import android.database.Cursor;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
+import android.provider.DocumentsContract;
 import android.util.Log;
+import android.widget.Toast;
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
@@ -17,13 +21,20 @@
 import com.samsung.microbit.data.constants.Constants;
 import com.samsung.microbit.data.constants.FileConstants;
 import com.samsung.microbit.data.model.Project;
+import com.samsung.microbit.ui.activity.ProjectActivity;
 
 import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.zip.ZipEntry;
@@ -243,4 +254,113 @@ public static boolean copyDownloads( Context context) {
         }
         return true;
     }
+
+    public static boolean writeStringToProjectHex( String hex, String fileName, Context ctx)
+    {
+        boolean ok = true;
+
+        File file = ProjectsHelper.projectFile( ctx, fileName);
+
+        try {
+            byte[] bytes = hex.getBytes();
+
+            if ( file.exists()) {
+                file.delete();
+            }
+            file.createNewFile();
+
+            FileOutputStream os = new FileOutputStream(file);
+            os.write( bytes);
+            os.flush();
+            os.close();
+        } catch ( Exception e) {
+            ok = false;
+        }
+        return ok;
+    }
+
+    public static enum enumImportResult {
+        Success,
+        NotFound,
+        ReadFailed,
+        NotHex,
+        AlreadyExists,
+        WriteFailed
+    }
+
+    public static class ProjectsHelperImportResult {
+
+        public enumImportResult result;
+        public File file;
+
+        public ProjectsHelperImportResult( enumImportResult resultIn) {
+            super();
+            result = resultIn;
+            file = null;
+        }
+
+        public ProjectsHelperImportResult( enumImportResult resultIn, File fileIn) {
+            super();
+            result = resultIn;
+            file = fileIn;
+        }
+    }
+
+    public static ProjectsHelperImportResult importToProjectsWork(Uri uri, Context ctx) {
+        if ( uri == null) {
+            return new ProjectsHelperImportResult( ProjectsHelper.enumImportResult.NotFound);
+        }
+
+        byte [] bytes = FileUtils.readBytesFromUri( uri, ctx);
+        if ( bytes == null) {
+            return new ProjectsHelperImportResult( ProjectsHelper.enumImportResult.ReadFailed);
+        }
+
+        if ( !FileUtils.isHex( bytes)) {
+            return new ProjectsHelperImportResult( ProjectsHelper.enumImportResult.NotHex);
+        }
+
+        String fileName = FileUtils.fileNameFromUri( uri, ctx);
+        if ( fileName == null) {
+            fileName = "import.hex";
+        }
+
+        File file = ProjectsHelper.projectFile( ctx, fileName);
+        if ( file.exists()) {
+            return new ProjectsHelperImportResult( ProjectsHelper.enumImportResult.AlreadyExists);
+        }
+
+        boolean saved = FileUtils.writeBytesToFile( file, bytes);
+        if ( !saved) {
+            if ( file.exists()) {
+                file.delete();
+            }
+            return new ProjectsHelperImportResult( ProjectsHelper.enumImportResult.WriteFailed);
+        }
+
+        return new ProjectsHelperImportResult( ProjectsHelper.enumImportResult.Success, file);
+    }
+
+    public static void importToProjectsToast(ProjectsHelper.enumImportResult result, Context ctx) {
+        switch ( result) {
+            case Success:
+                Toast.makeText( ctx, "micro:bit HEX imported", Toast.LENGTH_LONG).show();
+                break;
+            case NotFound:
+                Toast.makeText( ctx, "File not found", Toast.LENGTH_LONG).show();
+                break;
+            case ReadFailed:
+                Toast.makeText( ctx, "Could not read micro:bit HEX", Toast.LENGTH_LONG).show();
+                break;
+            case NotHex:
+                Toast.makeText( ctx, "Not a micro:bit HEX", Toast.LENGTH_LONG).show();
+                break;
+            case AlreadyExists:
+                Toast.makeText( ctx, "A project with the same name already exists", Toast.LENGTH_LONG).show();
+                break;
+            case WriteFailed:
+                Toast.makeText( ctx, "Could not store micro:bit HEX", Toast.LENGTH_LONG).show();
+                break;
+        }
+    }
 }

From c04e1c989bdc1f4a90a83b2dd64671848c1bb959 Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Sun, 3 Mar 2024 18:02:17 +0000
Subject: [PATCH 05/13] Projects - remove reconnection callback

---
 .../microbit/ui/activity/ProjectActivity.java | 136 +++++++++---------
 1 file changed, 70 insertions(+), 66 deletions(-)

diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
index b3b022c6..478e36a4 100644
--- a/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
+++ b/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
@@ -148,10 +148,11 @@ public class ProjectActivity extends Activity implements View.OnClickListener, B
     private BroadcastReceiver connectionChangedReceiver = BLEConnectionHandler.bleConnectionChangedReceiver(this);
 
     private Handler handler = new Handler();
-    private int countOfReconnecting;
-    private boolean sentPause;
 
-    private boolean notAValidFlashHexFile;
+//    // REMOVE tryToConnectAgain
+//    private int countOfReconnecting;
+//    private boolean sentPause;
+//    private boolean notAValidFlashHexFile;
 
     private boolean minimumPermissionsGranted;
 
@@ -186,44 +187,45 @@ public void onClick(View v) {
         }
     };
 
-    private final Runnable tryToConnectAgain = new Runnable() {
-
-        @Override
-        public void run() {
-            if(sentPause) {
-                countOfReconnecting++;
-            }
-
-            final LocalBroadcastManager localBroadcastManager = LocalBroadcastManager
-                    .getInstance(ProjectActivity.this);
-
-            if(countOfReconnecting == Constants.MAX_COUNT_OF_RE_CONNECTIONS_FOR_DFU) {
-                countOfReconnecting = 0;
-                Intent intent = new Intent(DfuService.BROADCAST_ACTION);
-                intent.putExtra(DfuService.EXTRA_ACTION, DfuService.ACTION_ABORT);
-                localBroadcastManager.sendBroadcast(intent);
-            } else {
-                final int nextAction;
-                final long delayForNewlyBroadcast;
-
-                if(sentPause) {
-                    nextAction = DfuService.ACTION_RESUME;
-                    delayForNewlyBroadcast = Constants.TIME_FOR_CONNECTION_COMPLETED;
-                } else {
-                    nextAction = DfuService.ACTION_PAUSE;
-                    delayForNewlyBroadcast = Constants.DELAY_BETWEEN_PAUSE_AND_RESUME;
-                }
-
-                sentPause = !sentPause;
-
-                Intent intent = new Intent(DfuService.BROADCAST_ACTION);
-                intent.putExtra(DfuService.EXTRA_ACTION, nextAction);
-                localBroadcastManager.sendBroadcast(intent);
-
-                handler.postDelayed(this, delayForNewlyBroadcast);
-            }
-        }
-    };
+//    // REMOVE tryToConnectAgain
+//    private final Runnable tryToConnectAgain = new Runnable() {
+//
+//        @Override
+//        public void run() {
+//            if (sentPause) {
+//                countOfReconnecting++;
+//            }
+//
+//            final LocalBroadcastManager localBroadcastManager = LocalBroadcastManager
+//                    .getInstance(ProjectActivity.this);
+//
+//            if (countOfReconnecting == Constants.MAX_COUNT_OF_RE_CONNECTIONS_FOR_DFU) {
+//                countOfReconnecting = 0;
+//                Intent intent = new Intent(DfuService.BROADCAST_ACTION);
+//                intent.putExtra(DfuService.EXTRA_ACTION, DfuService.ACTION_ABORT);
+//                localBroadcastManager.sendBroadcast(intent);
+//            } else {
+//                final int nextAction;
+//                final long delayForNewlyBroadcast;
+//
+//                if (sentPause) {
+//                    nextAction = DfuService.ACTION_RESUME;
+//                    delayForNewlyBroadcast = Constants.TIME_FOR_CONNECTION_COMPLETED;
+//                } else {
+//                    nextAction = DfuService.ACTION_PAUSE;
+//                    delayForNewlyBroadcast = Constants.DELAY_BETWEEN_PAUSE_AND_RESUME;
+//                }
+//
+//                sentPause = !sentPause;
+//
+//                Intent intent = new Intent(DfuService.BROADCAST_ACTION);
+//                intent.putExtra(DfuService.EXTRA_ACTION, nextAction);
+//                localBroadcastManager.sendBroadcast(intent);
+//
+//                handler.postDelayed(this, delayForNewlyBroadcast);
+//            }
+//        }
+//    };
 
     /**
      * Allows to handle forced closing of the bluetooth service and
@@ -618,7 +620,7 @@ protected void onResume() {
     @Override
     protected void onDestroy() {
 
-        handler.removeCallbacks(tryToConnectAgain);
+//        handler.removeCallbacks(tryToConnectAgain); // REMOVE tryToConnectAgain
 
         MBApp application = MBApp.getApp();
 
@@ -2069,17 +2071,18 @@ public void onClick(View v) {
                                         },//override click listener for ok button
                                         null);//pass null to use default listener
 
-                                countOfReconnecting = 0;
-                                sentPause = false;
-
-                                long delayForCheckOnConnection = Constants.TIME_FOR_CONNECTION_COMPLETED;
-
-                                if (notAValidFlashHexFile) {
-                                    notAValidFlashHexFile = false;
-                                    delayForCheckOnConnection += Constants.JUST_PAIRED_DELAY_ON_CONNECTION;
-                                }
-
-                                handler.postDelayed(tryToConnectAgain, delayForCheckOnConnection);
+//                                // REMOVE tryToConnectAgain
+//                                countOfReconnecting = 0;
+//                                sentPause = false;
+//
+//                                long delayForCheckOnConnection = Constants.TIME_FOR_CONNECTION_COMPLETED;
+//
+//                                if (notAValidFlashHexFile) {
+//                                    notAValidFlashHexFile = false;
+//                                    delayForCheckOnConnection += Constants.JUST_PAIRED_DELAY_ON_CONNECTION;
+//                                }
+//
+//                                handler.postDelayed(tryToConnectAgain, delayForCheckOnConnection);
                             }
 
                             inInit = true;
@@ -2163,7 +2166,7 @@ public void onClick(View v) {
                                     popupOkHandler);//pass null to use default listener
 
                             dfuUnregister();
-                            removeReconnectionRunnable();
+//                            removeReconnectionRunnable(); // REMOVE tryToConnectAgain
                             onFlashComplete();
                             break;
                         /*
@@ -2188,7 +2191,7 @@ public void onClick(View v) {
                                     popupOkHandler);//pass null to use default listener
 
                             dfuUnregister();
-                            removeReconnectionRunnable();
+//                            removeReconnectionRunnable();// REMOVE tryToConnectAgain
                             break;
                             */
                         default:
@@ -2209,8 +2212,7 @@ public void onClick(View v) {
                                 TYPE_PROGRESS_NOT_CANCELABLE, null, null);
 
                         inProgress = true;
-
-                        removeReconnectionRunnable();
+//                        removeReconnectionRunnable(); // REMOVE tryToConnectAgain
                     }
 
                     if ( state != progressState) {
@@ -2221,9 +2223,10 @@ public void onClick(View v) {
             } else if(intent.getAction().equals(DfuService.BROADCAST_ERROR)) {
                 int errorCode = intent.getIntExtra(DfuService.EXTRA_DATA, 0);
 
-                if(errorCode == DfuService.ERROR_FILE_INVALID) {
-                    notAValidFlashHexFile = true;
-                }
+//                // REMOVE tryToConnectAgain
+//                if(errorCode == DfuService.ERROR_FILE_INVALID) {
+//                    notAValidFlashHexFile = true;
+//                }
 
                 String error_message = GattError.parse(errorCode);
 
@@ -2239,7 +2242,7 @@ public void onClick(View v) {
                 MBApp application = MBApp.getApp();
 
                 dfuUnregister();
-                removeReconnectionRunnable();
+//                removeReconnectionRunnable(); // REMOVE tryToConnectAgain
                 //Update Stats
                 /*
                 GoogleAnalyticsManager.getInstance().sendFlashStats(
@@ -2300,11 +2303,12 @@ public void onClick(View v) {
 
     }
 
-    private void removeReconnectionRunnable() {
-        handler.removeCallbacks(tryToConnectAgain);
-        countOfReconnecting = 0;
-        sentPause = false;
-    }
+//    // REMOVE tryToConnectAgain
+//    private void removeReconnectionRunnable() {
+//        handler.removeCallbacks(tryToConnectAgain);
+//        countOfReconnecting = 0;
+//        sentPause = false;
+//    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {

From ec50459e56609c6bf97a5952439b9b7383c1e5fa Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Sun, 3 Mar 2024 18:32:39 +0000
Subject: [PATCH 06/13] MakeCode - fix click handlers for back, download, save

---
 .../microbit/ui/activity/MakeCodeWebView.java | 137 +++++++++++++-----
 1 file changed, 98 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java b/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java
index 8858fc48..42b28695 100644
--- a/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java
+++ b/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java
@@ -42,6 +42,7 @@ public class MakeCodeWebView extends Activity implements View.OnClickListener {
     public static String makecodeUrl = "https://makecode.microbit.org/?androidapp=" + BuildConfig.VERSION_CODE;
     public static Activity activityHandle = null;
 
+    boolean projectDownload = false;
     Uri hexToFlash;
 
     private static final int REQUEST_CODE_SAVEDATA = 1;
@@ -83,15 +84,9 @@ protected void onCreate(Bundle savedInstanceState) {
         webSettings.setBuiltInZoomControls(true);
         webSettings.setDisplayZoomControls(false);
         webSettings.setDomStorageEnabled(true);
-        webView.setWebContentsDebuggingEnabled(true);
+        WebView.setWebContentsDebuggingEnabled(false);
 
         webView.addJavascriptInterface(new JavaScriptInterface(this), "AndroidFunction");
-        webView.evaluateJavascript("javascript:(function f() { document.getElementsByClassName(\"brand\")[0].addEventListener(\"click\", function(e) { AndroidFunction.returnToHome(); e.preventDefault(); return false; }) })()", new ValueCallback<String>() {
-            @Override
-            public void onReceiveValue(String s) {
-                Log.d(TAG, s);
-            }
-        });
 
         webView.setWebViewClient(new WebViewClient() {
             @Override
@@ -106,6 +101,13 @@ public void onLoadResource(WebView view, String url) {
                 super.onLoadResource(view, url);
                 Log.v(TAG, "onLoadResource(" + url + ");");
             }
+
+            @Override
+            public void onPageFinished (WebView view, String url) {
+                super.onPageFinished(view, url);
+                Log.v(TAG, "onPageFinished(" + url + ");");
+                onPageFinishedJS( view, url);
+            }
         }); //setWebViewClient
 
         webView.setWebChromeClient(new WebChromeClient() {
@@ -323,7 +325,7 @@ private void importInitialise() {
             //TODO - does MakeCode signal when ready?
             Looper looper = Looper.getMainLooper();
             importHandler = new Handler(looper);
-            importHandler.postDelayed(importCallback, 1000);
+            importHandler.postDelayed(importCallback, 2000);
         }
     }
     private final Runnable importCallback = new Runnable() {
@@ -340,6 +342,8 @@ public void run() {
     };
 
     public void importPostMessage() {
+        Log.d(TAG, "importPostMessage");
+
         if ( importHex == null) {
             return;
         }
@@ -355,57 +359,112 @@ public void importPostMessage() {
 
         importPosting = true;
 
+        StringBuilder sb = new StringBuilder();
         String nl = "\n";
-        String script = "javascript:(";
-        script += nl + "function f() { ";
-        script += nl +   "var ret = 'OK'";
-        script += nl +   "try {";
-        script += nl +     "var loading = document.getElementById('loading')";
-        script += nl +     "if ( loading && loading.parentElement) {";
-        script += nl +       "ret = 'loading'";
-        script += nl +     "} else {";
-        script += nl +       "var name = \"" + importName + "\"";
-        script += nl +       "var hex = \"" + importHex + "\"";
-        script += nl +       "var msg = {";
-        script += nl +         "type: 'importfile',";
-        script += nl +         "filename: name,";
-        script += nl +         "parts: [ hex ]";
-        script += nl +       "}";
-        script += nl +       "window.postMessage( msg, '*')";
-        script += nl +     "}";
-        script += nl +   "} catch( err) {";
-        script += nl +     "ret = err.message";
-        script += nl +   "}";
-        script += nl +   "return ret;";
-        script += nl + "}";
-        script += nl + ")()";
-        webView.evaluateJavascript( script, new ValueCallback<String>() {
+        sb.append( "javascript:(");
+        sb.append(nl).append("function f() {");
+        sb.append(nl).append(   "var ret = 'OK'");
+        sb.append(nl).append(   "try {");
+        sb.append(nl).append(       "var loading = document.getElementById('loading')");
+        sb.append(nl).append(       "if ( loading && loading.parentElement) {");
+        sb.append(nl).append(           "ret = 'loading'");
+        sb.append(nl).append(       "} else {");
+        sb.append(nl).append(           "var name = '").append(importName).append("'");
+        sb.append(nl).append(           "var hex = '").append(importHex).append("'");
+        sb.append(nl).append(           "var msg = {");
+        sb.append(nl).append(               "type: 'importfile',");
+        sb.append(nl).append(               "filename: name,");
+        sb.append(nl).append(               "parts: [ hex ]");
+        sb.append(nl).append(           "}");
+        sb.append(nl).append(           "window.postMessage( msg, '*')");
+        sb.append(nl).append(       "}");
+        sb.append(nl).append(   "} catch( err) {");
+        sb.append(nl).append(       "ret = err.message");
+        sb.append(nl).append(   "}");
+        sb.append(nl).append(   "return ret");
+        sb.append(nl).append("}");
+        sb.append(nl).append(")()");
+
+        webView.evaluateJavascript( sb.toString(), new ValueCallback<String>() {
             @Override
             public void onReceiveValue(String s) {
-                Log.d(TAG, s);
-                if ( s != "loading") {
+                Log.i(TAG, "importPostMessage: " + s);
+                String loading = "\"loading\"";
+                String ok = "\"OK\"";
+                if ( s.equals( ok)) {
                     importHex = null;
+                } else if ( !s.equals( loading)) {
                 }
             }
         });
         importPosting = false;
-   }
-}
+    }
+
+    public void onPageFinishedJS( WebView view, String url) {
+        Log.v(TAG, "addListeners(" + url + ");");
+
+        StringBuilder sb = new StringBuilder();
+        String nl = "\n";
+        sb.append( "javascript:(");
+        sb.append(nl).append("function f() {");
+        sb.append(nl).append(   "var ret = 'OK'");
+        sb.append(nl).append(   "try {");
+        sb.append(nl).append(       "var brands = document.getElementsByClassName(\"brand\")");
+        sb.append(nl).append(       "for (let i = 0; brands != null && i < brands.length; i++) {");
+        sb.append(nl).append(           "brands[i].addEventListener(\"click\",");
+        sb.append(nl).append(               "function(e) {");
+        sb.append(nl).append(                   "AndroidFunction.clickBrand();");
+        sb.append(nl).append(                   "e.preventDefault();");
+        sb.append(nl).append(                   "return false;");
+        sb.append(nl).append(               "})");
+        sb.append(nl).append(       "}");
+        sb.append(nl).append(       "var downs = document.getElementsByClassName(\"download-button\")");
+        sb.append(nl).append(       "for (let i = 0; downs != null && i < downs.length; i++) {");
+        sb.append(nl).append(           "downs[i].addEventListener(\"click\",");
+        sb.append(nl).append(               "function(e) {");
+        sb.append(nl).append(                   "AndroidFunction.clickDownload();");
+        sb.append(nl).append(                   "e.preventDefault();");
+        sb.append(nl).append(                   "return false;");
+        sb.append(nl).append(               "})");
+        sb.append(nl).append(       "}");
+        sb.append(nl).append(   "} catch( err) {");
+        sb.append(nl).append(       "ret = err.message");
+        sb.append(nl).append(   "}");
+        sb.append(nl).append(   "return ret");
+        sb.append(nl).append("}");
+        sb.append(nl).append(")()");
+
+        webView.evaluateJavascript( sb.toString(), new ValueCallback<String>() {
+            @Override
+            public void onReceiveValue(String s) {
+                Log.d(TAG, s);
+            }
+        });
+    }}
 
 /* Javascript Interface */
 class JavaScriptInterface {
-    Context mContext;
+    MakeCodeWebView mContext;
 
-    JavaScriptInterface(Context c) {
+    JavaScriptInterface( MakeCodeWebView c) {
         mContext = c;
     }
 
     @JavascriptInterface
-    public void returnToHome() {
+    public void clickBrand() {
         try {
             MakeCodeWebView.activityHandle.finish();
         } catch(Exception e) {
             Log.v(TAG, e.toString());
         }
     }
+
+    @JavascriptInterface
+    public void clickDownload() {
+        try {
+            mContext.projectDownload = true;
+        } catch(Exception e) {
+            Log.v(TAG, e.toString());
+        }
+    }
 }

From 1acc2f2de8a655b9eb64ac50e9d43e3bf975989f Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Sun, 3 Mar 2024 20:18:59 +0000
Subject: [PATCH 07/13] MakeCode/Projects - import, save, download

---
 .../microbit/ui/activity/MakeCodeWebView.java |  99 ++---
 .../microbit/ui/activity/ProjectActivity.java | 360 +++++-------------
 .../microbit/ui/adapter/ProjectAdapter.java   |   1 +
 3 files changed, 150 insertions(+), 310 deletions(-)

diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java b/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java
index 42b28695..56963e61 100644
--- a/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java
+++ b/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java
@@ -18,9 +18,11 @@
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.Toast;
 
 import com.samsung.microbit.BuildConfig;
 import com.samsung.microbit.R;
+import com.samsung.microbit.utils.FileUtils;
 import com.samsung.microbit.utils.ProjectsHelper;
 
 import java.io.File;
@@ -43,10 +45,10 @@ public class MakeCodeWebView extends Activity implements View.OnClickListener {
     public static Activity activityHandle = null;
 
     boolean projectDownload = false;
-    Uri hexToFlash;
 
     private static final int REQUEST_CODE_SAVEDATA = 1;
     private static final int REQUEST_CODE_CHOOSE_FILE = 2;
+    private static final int REQUEST_CODE_FLASH = 3;
     private byte[] dataToSave = null;
     private ValueCallback<Uri[]> onShowFileChooser_filePathCallback;
 
@@ -198,33 +200,33 @@ public void onReceiveValue(String s) {
                     else if ( !hexName.isEmpty()) {
                         hexToWrite = getProjectFile(hexName);
 
-                        /*
-                        // Append n to file until it doesn't exist
-                        int i = 0;
-
-                        while (hexToWrite.exists()) {
-                            hexName = hexName.replaceAll("-?\\d*\\.","-" + i + ".");
-                            hexToWrite = getProjectFile( hexName);
-                            i++;
-                        }
-                         */
-                        // Replace existing file rather than creating *-n.hex
-                        if (hexToWrite.exists()) {
-                            hexToWrite.delete();
+//                        // Replace existing file rather than creating *-n.hex
+//                        // Append n to file until it doesn't exist
+//                        int i = 0;
+//
+//                        while (hexToWrite.exists()) {
+//                            hexName = hexName.replaceAll("-?\\d*\\.","-" + i + ".");
+//                            hexToWrite = getProjectFile( hexName);
+//                            i++;
+//                        }
+
+                        if ( !FileUtils.writeBytesToFile( hexToWrite, decode)) {
+                            ProjectsHelper.importToProjectsToast(
+                                    ProjectsHelper.enumImportResult.WriteFailed, MakeCodeWebView.this);
+                            return;
                         }
 
-                        // Create file
-                        hexToWrite.createNewFile();
-                        outputStream = new FileOutputStream(hexToWrite);
-                        outputStream.write(decode);
-                        outputStream.flush();
+                        boolean download = projectDownload;
+                        projectDownload = false;
 
-                        // Get file path
-                        hexToFlash = Uri.fromFile(hexToWrite);
-
-                        openProjectActivity();
+                        if ( download) {
+                            openProjectActivity( hexToWrite);
+                        } else {
+                            Toast.makeText( MakeCodeWebView.this,
+                                    "Saved to FLASH page", Toast.LENGTH_LONG).show();
+                        }
                     }
-                } catch (IOException e) {
+                } catch ( Exception e) {
                     e.printStackTrace();
                 }
             }
@@ -233,10 +235,13 @@ else if ( !hexName.isEmpty()) {
         //Check parameters Before load
         Intent intent = getIntent();
 
-        importHex = intent.getStringExtra("importHex");
-        importName = intent.getStringExtra("importName");
-
-        importInitialise();
+        boolean importExtra = intent.getBooleanExtra("import", false);
+        if ( importExtra) {
+            importInitialise();
+        } else {
+            importHex = null;
+            importName = null;
+        }
 
         webView.loadUrl(makecodeUrl);
     } // onCreate
@@ -254,27 +259,22 @@ private void saveData( String name, String mimetype, byte[] data) {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if ( requestCode == REQUEST_CODE_SAVEDATA) {
+        if ( requestCode == REQUEST_CODE_FLASH) {
+            if ( resultCode != RESULT_OK) {
+                return;
+            }
+        } else if ( requestCode == REQUEST_CODE_SAVEDATA) {
             if ( resultCode != RESULT_OK) {
                 dataToSave = null;
                 return;
             }
-            OutputStream os = null;
-            try {
-                os = getContentResolver().openOutputStream( data.getData());
-                if ( dataToSave != null && dataToSave.length > 0) {
-                    os.write(dataToSave, 0, dataToSave.length);
+            if ( dataToSave != null && dataToSave.length > 0) {
+                Uri uri = data.getData();
+                if ( !FileUtils.writeBytesToUri( uri, dataToSave, this)) {
+                    Toast.makeText(this, "Could not save file", Toast.LENGTH_LONG).show();
                 }
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                try {
-                    dataToSave = null;
-                    if ( os != null) {
-                        os.close();
-                    }
-                } catch (IOException e) { }
             }
+            dataToSave = null;
         } else if (requestCode == REQUEST_CODE_CHOOSE_FILE) {
             if ( resultCode != RESULT_OK) {
                 onShowFileChooser_filePathCallback.onReceiveValue( null);
@@ -305,14 +305,17 @@ public void onClick(final View v) {
         }
     }
 
-    void openProjectActivity() {
+    public final static String ACTION_FLASH = "com.samsung.microbit.ACTION_FLASH";
+
+    void openProjectActivity( File hexToWrite) {
         Intent i = new Intent(this, ProjectActivity.class);
-        i.setData(hexToFlash);
-        startActivity(i);
+        i.setAction( ACTION_FLASH);
+        i.putExtra("path", hexToWrite.getAbsolutePath());
+        startActivityForResult( i, REQUEST_CODE_FLASH);
     }
 
-    private static String importHex  = null;
-    private static String importName = null;
+    public static String importHex  = null;
+    public static String importName = null;
     private boolean importPosting = false;
     Handler importHandler = null;
 
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
index 478e36a4..fb06b7c6 100644
--- a/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
+++ b/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
@@ -156,9 +156,7 @@ public class ProjectActivity extends Activity implements View.OnClickListener, B
 
     private boolean minimumPermissionsGranted;
 
-    private boolean previousPartialFlashFailed = false;
-
-    private boolean finishWhenFlashComplete = true;
+    private boolean inMakeCodeActionFlash = false;
     private String applicationHexAbsolutePath;
     private int prepareToFlashResult;
 
@@ -168,12 +166,29 @@ public class ProjectActivity extends Activity implements View.OnClickListener, B
 
     BLEService bleService;
 
-    private void onFlashComplete() {
-        if ( finishWhenFlashComplete) {
+    private void goToMakeCode( String hex, String name) {
+        if ( inMakeCodeActionFlash) {
+            inMakeCodeActionFlash = false;
+            setResult( Activity.RESULT_OK);
+            finish();
+        } else {
+            Intent intent = new Intent(this, MakeCodeWebView.class);
+            if ( hex != null && !hex.isEmpty()) {
+                MakeCodeWebView.importHex  = hex;
+                MakeCodeWebView.importName = name;
+                intent.putExtra("import", true);
+            }
+            startActivity(intent);
             finish();
         }
     }
 
+    private void onFlashComplete() {
+        if ( inMakeCodeActionFlash) {
+            goToMakeCode( null, null);
+        }
+    }
+
     /**
      * Handler for popup button that hides a popup window
      * and calls onFlashComplete()
@@ -450,8 +465,7 @@ protected void onCreate(Bundle savedInstanceState) {
         checkMinimumPermissionsForThisScreen();
         setConnectedDeviceText();
 
-        if(savedInstanceState == null && getIntent() != null) {
-            finishWhenFlashComplete = getIntent().getData() != null;
+        if (savedInstanceState == null && getIntent() != null) {
             handleIncomingIntent(getIntent());
         }
     }
@@ -465,148 +479,47 @@ protected void onNewIntent(Intent intent) {
     }
 
     private void handleIncomingIntent(Intent intent) {
-        boolean isOpenByOtherApp = false;
-        String fullPathOfFile;
-        String fileName;
-
-        Project externalProject = null;
-        Uri uri = null;
-
         String action = intent.getAction();
-        String type = intent.getType();
-        if ( Intent.ACTION_SEND.equals(action) && intent.hasExtra( Intent.EXTRA_STREAM)) {
-            uri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
-        } else if(intent.getData() != null && intent.getData().getEncodedPath() != null) {
-            uri = intent.getData();
-        }
-
-        if ( uri != null) {
-            isOpenByOtherApp = true;
-            String encodedPath = uri.getEncodedPath();
-
-            String scheme = uri.getScheme();
-            if (scheme.equals("file")) {
-                fullPathOfFile = URLDecoder.decode(encodedPath);
-                fileName = fileNameForFlashing(fullPathOfFile);
-                externalProject = fileName == null ? null : new Project(fileName, fullPathOfFile, 0, null, false);
-            } else if(scheme.equals("content")) {
-                Cursor cursor = null;
-                try {
-                    cursor = getContentResolver().query(uri, null, null, null, null);
-
-                    if (cursor != null && cursor.moveToFirst()) {
-                        String selectedFileName = cursor.getString(cursor.getColumnIndex(DocumentsContract.Document
-                                .COLUMN_DISPLAY_NAME));
-
-                        // If application is opened from My Files (Android 6.0), cursor don't contains
-                        // COLUMN_DOCUMENT_ID, and stream not needed to copy to Download directory. It is already
-                        // there
-                        boolean isShareableApp = cursor.getColumnIndex(DocumentsContract.Document
-                                .COLUMN_DOCUMENT_ID) != -1;
-
-                        fullPathOfFile = ProjectsHelper.projectPath(this, selectedFileName);
-
-                        if (isShareableApp) {
-                            try {
-                                IOUtils.copy(getContentResolver().openInputStream(uri), new FileOutputStream(fullPathOfFile));
-                            } catch (Exception e) {
-                                Log.e(TAG, e.toString());
-                            }
-                        }
-
-                        fileName = fileNameForFlashing(fullPathOfFile);
-                        externalProject = fileName == null ? null : new Project(fileName, fullPathOfFile, 0, null, false);
-                    } else {
-                        try {
-                            AssetFileDescriptor fileDescriptor = getContentResolver().openAssetFileDescriptor(uri, "r");
-
-                            if(fileDescriptor != null) {
-                                long length = fileDescriptor.getLength();
-
-                                fileDescriptor.close();
-                                externalProject = getLatestProjectFromFolder(length);
-                            }
-                        } catch(IOException e) {
-                            Log.e(TAG, e.toString());
-                        }
-                    }
-                } finally {
-                    if (cursor != null) {
-                        cursor.close();
-                    }
-                }
-
-            } else {
-                Log.e(TAG, "Unknown schema: " + scheme);
-                return;
-            }
+        if (action != null && action.equals(MakeCodeWebView.ACTION_FLASH)) {
+            makeCodeActionFlash(intent);
+            return;
         }
 
-        if ( externalProject != null) {
-            mProgramToSend = externalProject;
-            setActivityState(FlashActivityState.STATE_ENABLE_BT_EXTERNAL_FLASH_REQUEST);
-        }
+        inMakeCodeActionFlash = false;
 
-        if ( mProgramToSend != null) {
-            startBluetoothForFlashing();
+        Uri uri = null;
+        if (action != null && action.equals(Intent.ACTION_SEND) && intent.hasExtra(Intent.EXTRA_STREAM)) {
+            uri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
+        } else if (intent.getData() != null && intent.getData().getEncodedPath() != null) {
+            uri = intent.getData();
         } else {
-            if ( isOpenByOtherApp) {
-                Toast.makeText(this, "Not a micro:bit HEX file", Toast.LENGTH_LONG).show();
-                onFlashComplete();
-            }
+            return;
         }
+        importToProjects( uri);
     }
 
-    private Project getLatestProjectFromFolder(long lengthOfSearchingFile) {
-        FilenameFilter hexFilenameFilter = new FilenameFilter() {
-            @Override
-            public boolean accept(File dir, String filename) {
-                return filename.endsWith(".hex");
-            }
-        };
+    private void makeCodeActionFlash(Intent intent) {
+        setActivityState(FlashActivityState.STATE_ENABLE_BT_EXTERNAL_FLASH_REQUEST);
 
-        File nowDownloadedFile = null;
+        inMakeCodeActionFlash = true;
 
-        // TODO: What folder should we search - downloads or projects?
-        File[] downloadFiles = ProjectsHelper.downloadsFilesListHEX( this);
-
-        if(downloadFiles != null) {
-            for(File file : downloadFiles) {
-                if(nowDownloadedFile == null) {
-                    if(file.length() == lengthOfSearchingFile) {
-                        nowDownloadedFile = file;
-                    }
-                } else if(file.length() == lengthOfSearchingFile && file.lastModified() > nowDownloadedFile.lastModified
-                        ()) {
-                    nowDownloadedFile = file;
-                }
+        mProgramToSend = null;
+        String fullPathOfFile = intent.getStringExtra("path");
+        if ( fullPathOfFile != null) {
+            String fileName = FileUtils.fileNameFromPath( fullPathOfFile);
+            if ( fileName != null) {
+                mProgramToSend = new Project(fileName, fullPathOfFile,
+                        0, null, false);
             }
         }
 
-        String fullPathOfFile;
-        if(nowDownloadedFile == null) {
-            Log.e(TAG, "Can't find file");
-            return null;
-        } else {
-            fullPathOfFile = nowDownloadedFile.getAbsolutePath();
-            String fileName = fileNameForFlashing(fullPathOfFile);
-            return fileName == null ? null : new Project(fileNameForFlashing(fullPathOfFile), fullPathOfFile, 0, null, false);
+        if ( mProgramToSend == null) {
+            Toast.makeText(this, "Not a micro:bit HEX file", Toast.LENGTH_LONG).show();
+            onFlashComplete();
+            return;
         }
-    }
 
-    /**
-     * Check file path. If file ends with .hex, then just return it name, else return {@code null}
-     *
-     * @param fullPathOfFile Path to file, that checks
-     * @return
-     */
-    private String fileNameForFlashing(String fullPathOfFile) {
-        String path[] = fullPathOfFile.split("/");
-        if(path[path.length - 1].endsWith(".hex")) {
-            return path[path.length - 1];
-        } else {
-            return null;
-        }
+        startBluetoothForFlashing();
     }
 
     @Override
@@ -1129,6 +1042,15 @@ public void sendProject(final Project project) {
         startBluetoothForFlashing();
     }
 
+    /**
+     * Sends a project to the editor.
+     *
+     * @param project Project to edit.
+     */
+    public void editProject(final Project project) {
+        makecodeEditProject( project);
+    }
+
     @Override
     public void onClick(final View v) {
         switch(v.getId()) {
@@ -1948,8 +1870,6 @@ public void onClick(View v) {
             } else if(intent.getAction().equals(PartialFlashingService.BROADCAST_PF_FAILED)) {
 
                 Log.v(TAG, "Partial flashing failed");
-                previousPartialFlashFailed = true;
-
                 // If Partial Flashing Fails - DON'T ATTEMPT FULL DFU automatically
                 // Set flag to avoid partial flash next time
                 PopUp.show(getString(R.string.could_not_connect), //message
@@ -2034,8 +1954,6 @@ public void onClick(View v) {
                                         */
                                 ServiceUtils.sendConnectDisconnectMessage(false);
 
-                                previousPartialFlashFailed = false;
-
                                 PopUp.show(getString(R.string.flashing_success_message), //message
                                         getString(R.string.flashing_success_title), //title
                                         R.drawable.message_face, R.drawable.blue_btn,
@@ -2344,8 +2262,7 @@ public boolean onMenuItemClick(MenuItem item) {
     }
 
     private void scriptsCreateCode() {
-        Intent launchMakeCodeIntent = new Intent(this, MakeCodeWebView.class);
-        startActivity(launchMakeCodeIntent);
+        goToMakeCode( null, null);
     }
 
     private static final int REQUEST_CODE_EXPORT = 1;
@@ -2365,108 +2282,8 @@ protected void onActivityResultScriptsImport(int requestCode, int resultCode, In
         if ( resultCode != RESULT_OK) {
             return;
         }
-        Toast.makeText(this, "Importing project", Toast.LENGTH_LONG).show();
-        new Thread( new Runnable() {
-            @Override
-            public void run() {
-                int error = scriptsImportOpen( data.getData());
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        switch (error) {
-                            case 0:
-                                if ( minimumPermissionsGranted) {
-                                    updateProjectsListSortOrder(true);
-                                }
-                                break;
-                            case 1:
-                                Toast.makeText( ProjectActivity.this,
-                                        "Project import failed", Toast.LENGTH_LONG).show();
-                                break;
-                            case 2:
-                                Toast.makeText( ProjectActivity.this,
-                                        "A project with the same name already exists",
-                                        Toast.LENGTH_LONG).show();
-                                break;
-                        }
-                    }
-                });
-            }
-        }).start();
-    }
-
-    private int scriptsImportOpen( Uri uri) {
-        String fileName = "microbit-import.hex";
-
-        String scheme = uri.getScheme();
-        String mime = getContentResolver().getType(uri);
-        if ( scheme.equals("file")) {
-            String encodedPath = uri.getEncodedPath();
-            String path = URLDecoder.decode(encodedPath);
-            fileName = fileNameForFlashing( path);
-        } else if( scheme.equals("content")) {
-            Cursor cursor = null;
-            cursor = getContentResolver().query(uri, null, null, null, null);
-            if (cursor != null && cursor.moveToFirst()) {
-                int index = cursor.getColumnIndex(DocumentsContract.Document.COLUMN_DISPLAY_NAME);
-                if (index >= 0) {
-                    fileName = cursor.getString(index);
-                }
-            }
-        }
-
-        String projectPath = ProjectsHelper.projectPath(this, fileName);
-        if ( FileUtils.fileExists( projectPath)) {
-            return 2;
-        }
-
-        boolean ok = true;
-        FileInputStream fis = null;
-        BufferedReader reader = null;
-        try {
-            IOUtils.copy(getContentResolver().openInputStream(uri), new FileOutputStream(projectPath));
-
-            // Check file is hex
-            int lineCount = 0;
-            fis = new FileInputStream( projectPath);
-            reader = new BufferedReader( new InputStreamReader( fis));
-            while ( true) {
-                String line = reader.readLine();
-                if ( line == null) {
-                    break;
-                }
-                lineCount++;
-                if ( !line.isEmpty() && !line.startsWith(":")) {
-                    ok = false;
-                    break;
-                }
-                if ( lineCount == 0) {
-                    ok = false;
-                }
-            }
-        } catch (Exception e) {
-            logi( e.toString());
-            ok = false;
-        }
-
-        if ( reader != null) {
-            try {
-                reader.close();
-            } catch (IOException e) {
-            }
-        }
-
-        if ( fis != null) {
-            try {
-                fis.close();
-            } catch (IOException e) {
-            }
-        }
-
-        if ( !ok) {
-            FileUtils.deleteFile( projectPath);
-        }
-        return ok ? 0 : 1;
+        Uri uri = data.getData();
+        importToProjects( uri);
     }
 
     private void scriptsExport() {
@@ -2566,32 +2383,51 @@ public void makecodeEditProject(final Project project) {
     }
 
     private void makecodeEditFile( File file) {
-        String hex = readHexFileToString( file);
-        makecodeEditHex( hex, file.getName());
+        String hex = FileUtils.readStringFromHexFile( file);
+        // Look for MakeCode script magic
+        CharSequence s = "41140E2FB82FA2BB";
+        if ( hex.contains( s)) {
+            makecodeEditHex(hex, file.getName());
+        } else {
+            Toast.makeText(this, "Not a MakeCode HEX file", Toast.LENGTH_LONG).show();
+        }
     }
 
     private void makecodeEditHex( String hex, String name) {
-        Intent launchMakeCodeIntent = new Intent(this, MakeCodeWebView.class);
-        if ( !hex.isEmpty()) {
-            launchMakeCodeIntent.putExtra("importHex", hex);
-            launchMakeCodeIntent.putExtra("importName", name);
-        }
-        startActivity(launchMakeCodeIntent);
+        goToMakeCode( hex, name);
     }
 
-    private String readHexFileToString( File file) {
-        String hex = "";
+    protected void importToProjects( Uri uri) {
+        Toast.makeText(this, "Importing micro:bit HEX", Toast.LENGTH_LONG).show();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                ProjectsHelper.ProjectsHelperImportResult result = ProjectsHelper.importToProjectsWork(uri, ProjectActivity.this);
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        ProjectsHelper.importToProjectsToast( result.result, ProjectActivity.this);
+                        if (result.result == ProjectsHelper.enumImportResult.Success) {
+                            importToProjectsSuccess( result.file);
+                        }
+                    }
+                });
+            }
+        }).start();
+    }
 
-        int size = (int) file.length();
-        byte[] bytes = new byte[size];
-        try {
-            BufferedInputStream buf = new BufferedInputStream( new FileInputStream(file));
-            buf.read(bytes, 0, bytes.length);
-            buf.close();
-            hex = new String( bytes);
-        } catch (Exception e) {
-            hex = "";
+    protected void importToProjectsSuccess( File file) {
+        if ( minimumPermissionsGranted) {
+            updateProjectsListSortOrder(true);
+        }
+
+        // TODO - expand the project list item?
+
+        String hex = FileUtils.readStringFromHexFile( file);
+        // Look for MakeCode script magic
+        CharSequence s = "41140E2FB82FA2BB";
+        if ( hex.contains( s)) {
+            makecodeEditHex(hex, file.getName());
         }
-        return hex;
     }
 }
diff --git a/app/src/main/java/com/samsung/microbit/ui/adapter/ProjectAdapter.java b/app/src/main/java/com/samsung/microbit/ui/adapter/ProjectAdapter.java
index c3d44c55..4de63203 100644
--- a/app/src/main/java/com/samsung/microbit/ui/adapter/ProjectAdapter.java
+++ b/app/src/main/java/com/samsung/microbit/ui/adapter/ProjectAdapter.java
@@ -301,6 +301,7 @@ public void onClick(View v) {
         @Override
         public void onClick(View v) {
             logi("editBtnClickListener() :: ");
+            mProjectActivity.editProject((Project) ProjectAdapter.this.getItem((Integer) v.getTag()));
         }
     };
 

From 0daa3592b268a2291d8e34757b0572ad1e4b63f6 Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:21:10 +0000
Subject: [PATCH 08/13] Projects - remove background from permission prompt

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 63248c67..28454900 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -354,7 +354,7 @@
     <string name="storage_permission_for_programs">We need storage permission to list all the program files saved on your device.\n Proceed?</string>
     <string name="storage_permission_for_programs_error">Cannot display any program files.</string>
 
-    <string name="location_permission_pairing">We need permission to use your background location to enable BLE. This allows the app to search for and find your micro:bit.\n Proceed?</string>
+    <string name="location_permission_pairing">We need permission to use your location to enable BLE. This allows the app to search for and find your micro:bit.\n Proceed?</string>
     <string name="location_permission_error">Cannot pair new micro:bit without having location permission.</string>
 
     <string name="ble_permission">We need nearby devices permission to connect to your micro:bit.\n Proceed?</string>

From 47169642f2d3f6272fd17578b0d74f11a2b0cffd Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:26:52 +0000
Subject: [PATCH 09/13] irmHexUtils - fix V2 checksums

---
 .../samsung/microbit/utils/irmHexUtils.java   | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/samsung/microbit/utils/irmHexUtils.java b/app/src/main/java/com/samsung/microbit/utils/irmHexUtils.java
index 2dd5cafb..79e8095a 100644
--- a/app/src/main/java/com/samsung/microbit/utils/irmHexUtils.java
+++ b/app/src/main/java/com/samsung/microbit/utils/irmHexUtils.java
@@ -64,6 +64,16 @@ public void scanInit() {
         resultAddrNext = 0;
     }
 
+    public static byte digittohex( int d) {
+        if ( d >= 0 && d <= 9) {
+            return (byte) ( '0' + d);
+        }
+        if ( d >= 10 && d <= 16) {
+            return (byte) ( 'A' + ( d - 10));
+        }
+        return -1;
+    }
+
     public static int hextodigit( final byte c) {
         if ( c >= '0' && c <= '9') {
             return c - '0';
@@ -199,6 +209,29 @@ public static int lineCheck( final byte [] hex, final int hexIdx) {
         return hextobyte( hex, hexIdx + 9 + count * 2);
     }
 
+    public static boolean setCheck( byte [] hex, final int hexIdx) {
+        int sum = calcSum(hex, hexIdx);
+        if (sum < 0) {
+            return false;
+        }
+        int check = (sum == 0 ? 0 : (256 - sum));
+        int count = hextobyte( hex, hexIdx + 1);
+        int checkIdx = hexIdx + 9 + count * 2;
+        hex[ checkIdx]     = digittohex(check / 16);
+        hex[ checkIdx + 1] = digittohex(check % 16);
+
+        int chk = irmHexUtils.lineCheck( hex, hexIdx);
+        if ( chk < 0) {
+            return false;
+        }
+        sum = irmHexUtils.calcSum( hex, hexIdx);
+        sum = ( chk + sum) % 256;
+        if ( sum != 0 ) {
+            return false;
+        }
+        return true;
+    }
+
     public static boolean lineData( final byte [] hex, final int hexIdx, byte [] data, final int idx) {
         int count = hextobyte( hex, hexIdx + 1);
         if ( count < 0)
@@ -339,7 +372,6 @@ public int scanForDataHex( byte [] datahex, final int hexBlock, final byte [] un
                     if ( !isUniversal || dataWanted) {
                         long fullAddr = lastBaseAddr + lineAddr;
                         if ( fullAddr + lineCount > scanAddrMin && fullAddr < scanAddrNext) {
-                            // TODO support part lines?
                             if ( resultAddrMin > fullAddr) {
                                 resultAddrMin = fullAddr;
                             }
@@ -350,6 +382,9 @@ public int scanForDataHex( byte [] datahex, final int hexBlock, final byte [] un
                                 System.arraycopy(universalhex, lineHidx, datahex, hexSize, rlen);
                                 datahex[hexSize + 7] = '0';
                                 datahex[hexSize + 8] = '0';
+                                if ( !setCheck( datahex, hexSize)) {
+                                    return 0;
+                                }
                             }
                             lastSize = hexSize;
                             lastType = lineType;
@@ -459,4 +494,4 @@ public boolean universalHexToApplicationHex( final byte [] universalHex, final i
         scanAddrNext = mnp[1];
         return scanForDataHex( universalHex, hexBlock);
     }
-};
\ No newline at end of file
+};

From d535b56400dbf272b158245cf0d39272c377bed1 Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:28:41 +0000
Subject: [PATCH 10/13] irmHexUtils - add conversion to binary

---
 .../samsung/microbit/utils/irmHexUtils.java   | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/app/src/main/java/com/samsung/microbit/utils/irmHexUtils.java b/app/src/main/java/com/samsung/microbit/utils/irmHexUtils.java
index 79e8095a..54856164 100644
--- a/app/src/main/java/com/samsung/microbit/utils/irmHexUtils.java
+++ b/app/src/main/java/com/samsung/microbit/utils/irmHexUtils.java
@@ -48,6 +48,7 @@ public class irmHexUtils {
     public long resultAddrNext;
     public int resultDataSize;
     public byte [] resultHex;
+    public byte [] resultData;
 
     public void scanInit() {
         scanHexSize = 0;
@@ -494,4 +495,95 @@ public boolean universalHexToApplicationHex( final byte [] universalHex, final i
         scanAddrNext = mnp[1];
         return scanForDataHex( universalHex, hexBlock);
     }
+
+    // Extract data from records (0x00, 0x0D)
+    public int scanForData( byte [] data, final byte [] hex, final int hexSize) {
+        scanHexSize = hexSize;
+
+        for ( lineNext = 0; lineNext < scanHexSize; /*empty*/) {
+            if (!parseLine( hex))
+                return 0;
+
+            int rlen = lineNext - lineHidx;
+            if ( rlen == 0)
+                continue;
+
+            switch ( lineType) {
+                case 0:                 // Data
+                case 0x0D:
+                    long fullAddr = lastBaseAddr + lineAddr;
+                    if ( fullAddr + lineCount > scanAddrMin && fullAddr < scanAddrNext) {
+                        int first = (int) ( scanAddrMin > fullAddr ? scanAddrMin - fullAddr : 0);
+                        int next  = (int) ( scanAddrNext < fullAddr + lineCount ? scanAddrNext - fullAddr : lineCount);
+                        int length = next - first;
+                        int dataOffset = (int) ( fullAddr + first - scanAddrMin);
+                        if ( data != null) {
+                            byte [] lineBytes = new byte[ lineCount];
+                            if ( !lineData( hex, lineHidx, lineBytes, 0)) {
+                                return 0;
+                            }
+                            System.arraycopy( lineBytes, first, data, dataOffset, length);
+                        }
+                        if ( resultAddrMin > fullAddr + first) {
+                            resultAddrMin = fullAddr + first;
+                        }
+                        if ( resultAddrNext < fullAddr + next) {
+                            resultAddrNext = fullAddr + next;
+                        }
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        // calculate size of data from scanMin
+        if ( resultAddrNext > resultAddrMin) {
+            resultDataSize = ( int) ( resultAddrNext - scanAddrMin);
+        } else {
+            resultDataSize = 0; // no data between
+        }
+
+        return resultDataSize;
+    }
+
+    // Scan for single target data hex from universal hex
+    //
+    // return false on failure
+    public boolean scanForData( final byte [] hex) {
+        resultData = null;
+
+        try {
+            long dataSize = scanForData( null, hex, hex.length);
+            if ( dataSize == 0)
+                return false;
+
+            if ( dataSize % 4 != 0) {
+                // Android DFU library will not proceed if data is not word aligned
+                // iOS library doesn't seem to mind
+                dataSize += 4 - dataSize % 4;
+            }
+            resultData = new byte[ (int) dataSize];
+            Arrays.fill( resultData, (byte) 0xFF);
+            dataSize = scanForData( resultData, hex, hex.length);
+            if ( dataSize == 0) {
+                return false;
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+
+    // Extract data from application hex
+    //
+    // return false on failure
+    // generated data is in resultData
+    public boolean applicationHexToData( final byte [] hex, final int hexBlock) {
+        scanInit();
+        long [] mnp = hexBlockToAppRegion( hexBlock);
+        scanAddrMin = mnp[0];
+        scanAddrNext = mnp[1];
+        return scanForData( hex);
+    }
 };

From 021cda9e7862d9cb756f1c8b82102a1070e19964 Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:45:36 +0000
Subject: [PATCH 11/13] Projects - use BIN file for DFU

---
 .../microbit/ui/activity/ProjectActivity.java | 201 ++++++++++--------
 1 file changed, 110 insertions(+), 91 deletions(-)

diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
index fb06b7c6..812ddd7d 100644
--- a/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
+++ b/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
@@ -157,7 +157,7 @@ public class ProjectActivity extends Activity implements View.OnClickListener, B
     private boolean minimumPermissionsGranted;
 
     private boolean inMakeCodeActionFlash = false;
-    private String applicationHexAbsolutePath;
+    private int applicationSize;
     private int prepareToFlashResult;
 
 
@@ -1246,6 +1246,22 @@ protected void popupFailedToCreateFiles() {
                 popupClickFlashComplete, popupClickFlashComplete);
     }
 
+    public String getCachePathAppHex() {
+        return this.getCacheDir() + "/application.hex";
+    }
+
+    public String getCachePathAppBin() {
+        return this.getCacheDir() + "/application.bin";
+    }
+
+    public String getCachePathAppDat() {
+        return this.getCacheDir() + "/application.dat";
+    }
+
+    public String getCachePathAppZip() {
+        return this.getCacheDir() + "/update.zip";
+    }
+
     protected int prepareToFlash() {
         logi("prepareToFlash");
 
@@ -1264,27 +1280,33 @@ protected int prepareToFlash() {
 //        hexAbsolutePath = oldret[0];
 //        int oldapplicationSize = Integer.parseInt(oldret[1]);
 
-        String[] ret = universalHexToDFU(mProgramToSend.filePath, hardwareType);
-        applicationHexAbsolutePath = ret[0];
-        int applicationSize = Integer.parseInt(ret[1]);
+        applicationSize = universalHexToDFU( mProgramToSend.filePath, hardwareType);
 
-        if(applicationSize == -1) {
-            // V1 Hex on a V2
+        if( applicationSize <= 0) {
+            // incompatible hex
             return 1;
         }
 
-        // If V2 create init packet
-        String initPacketAbsolutePath = "-1";
-        if(hardwareType == MICROBIT_V2) {
-            try {
-                initPacketAbsolutePath = createDFUInitPacket(applicationSize);
-                String[] files = new String[]{initPacketAbsolutePath, applicationHexAbsolutePath};
-                createDFUZip(files);
-            } catch (IOException e) {
-                Log.v(TAG, "Failed to create init packet");
-                e.printStackTrace();
+        try {
+            applicationSize = createAppBin( hardwareType);
+            if ( applicationSize <= 0) {
                 return 2;
             }
+
+            if ( hardwareType == MICROBIT_V2) {
+                // If V2 create init packet and zip package
+                if ( !createAppDat(applicationSize)) {
+                    return 2;
+                }
+                String[] files = new String[]{ getCachePathAppDat(), getCachePathAppBin()};
+                if ( !createDFUZip(files)) {
+                    return 2;
+                }
+            }
+        } catch (IOException e) {
+            Log.v(TAG, "Failed to create init packet");
+            e.printStackTrace();
+            return 2;
         }
 
         return 0;
@@ -1306,7 +1328,7 @@ public void startDFUFlash() {
 
         // Start DFU Service
         Log.v(TAG, "Start Full DFU");
-        Log.v(TAG, "DFU hex: " + applicationHexAbsolutePath);
+        Log.v(TAG, "DFU bin: " + getCachePathAppBin());
         if(hardwareType == MICROBIT_V2) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 DfuServiceInitiator.createDfuNotificationChannel(this);
@@ -1321,7 +1343,7 @@ public void startDFUFlash() {
                     .setRestoreBond(true)
                     .setKeepBond(true)
                     .setForeground(true)
-                    .setZip(this.getCacheDir() + "/update.zip");
+                    .setZip( getCachePathAppZip());
             final DfuServiceController controller = starter.start(this, DfuService.class);
         } else {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -1332,7 +1354,7 @@ public void startDFUFlash() {
                     .setKeepBond(true)
                     .setForceDfu(true)
                     .setPacketsReceiptNotificationsEnabled(true)
-                    .setBinOrHex(DfuBaseService.TYPE_APPLICATION, applicationHexAbsolutePath);
+                    .setBinOrHex(DfuBaseService.TYPE_APPLICATION, getCachePathAppBin());
             final DfuServiceController controller = starter.start(this, DfuService.class);
         }
     }
@@ -1351,7 +1373,7 @@ protected void startPartialFlash() {
         }
         service = new Intent(application, PartialFlashingService.class);
         service.putExtra("deviceAddress", currentMicrobit.mAddress);
-        service.putExtra("filepath", applicationHexAbsolutePath); // a path or URI must be provided.
+        service.putExtra("filepath", getCachePathAppHex()); // a path or URI must be provided.
         service.putExtra("hardwareType", hardwareType); // a path or URI must be provided.
         service.putExtra("pf", true); // Enable partial flashing
         application.startService(service);
@@ -1362,16 +1384,16 @@ protected void startPartialFlash() {
     /**
      * Create zip for DFU
      */
-    private String createDFUZip(String[] srcFiles ) throws IOException {
+    private boolean createDFUZip(String[] srcFiles ) throws IOException {
         byte[] buffer = new byte[1024];
 
-        File zipFile = new File(this.getCacheDir() + "/update.zip");
+        File zipFile = new File( getCachePathAppZip());
         if (zipFile.exists()) {
             zipFile.delete();
         }
         zipFile.createNewFile();
 
-        FileOutputStream fileOutputStream = new FileOutputStream(this.getCacheDir() + "/update.zip");
+        FileOutputStream fileOutputStream = new FileOutputStream( getCachePathAppZip());
         ZipOutputStream zipOutputStream = new ZipOutputStream(fileOutputStream);
 
         for (int i=0; i < srcFiles.length; i++) {
@@ -1393,105 +1415,102 @@ private String createDFUZip(String[] srcFiles ) throws IOException {
         // close the ZipOutputStream
         zipOutputStream.close();
 
-        return this.getCacheDir() + "/update.zip";
+        return true;
     }
 
     /**
      * Create DFU init packet from HEX
-     * @param hexLength
+     * @param appSize
      */
-    private String createDFUInitPacket(int hexLength) throws IOException {
-        ByteArrayOutputStream outputInitPacket;
-        outputInitPacket = new ByteArrayOutputStream();
-
-        Log.v(TAG, "DFU App Length: " + hexLength);
-
-        outputInitPacket.write("microbit_app".getBytes()); // "microbit_app"
-        outputInitPacket.write(new byte[]{0x1, 0, 0, 0});  // Init packet version
-        outputInitPacket.write(ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN).putInt(hexLength).array());  // App size
-        outputInitPacket.write(new byte[]{0, 0, 0, 0x0});  // Hash Size. 0: Ignore Hash
-        outputInitPacket.write(new byte[]{
-                0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0
-        }); // Hash
+    private boolean createAppDat( int appSize) throws IOException {
+        Log.v(TAG, "createAppDat " + appSize);
+
+        //typedef struct {
+        //    uint8_t  magic[12];                 // identify this struct "microbit_app"
+        //    uint32_t version;                   // version of this struct == 1
+        //    uint32_t app_size;                  // only used for DFU_FW_TYPE_APPLICATION
+        //    uint32_t hash_size;                 // 32 => DFU_HASH_TYPE_SHA256 or zero to bypass hash check
+        //    uint8_t  hash_bytes[32];            // hash of whole DFU download
+        //} microbit_dfu_app_t;
+        byte [] magic  = "microbit_app".getBytes();
+        byte [] sizeLE = ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN).putInt( appSize).array();
+        byte [] dat = new byte[ 56];
+        Arrays.fill( dat, (byte) 0);
+        System.arraycopy( magic, 0, dat, 0, magic.length);
+        dat[ 12] = 1;
+        System.arraycopy( sizeLE, 0, dat, 16, 4);
 
         // Write to temp file
-        File initPacket = new File(this.getCacheDir() + "/application.dat");
-        if (initPacket.exists()) {
-            initPacket.delete();
+        File datFile = new File( getCachePathAppDat());
+        if ( datFile.exists()) {
+            datFile.delete();
         }
-        initPacket.createNewFile();
+        if ( !FileUtils.writeBytesToFile( datFile, dat)) {
+            return false;
+        }
+        return true;
+    }
 
-        FileOutputStream outputStream;
-        outputStream = new FileOutputStream(initPacket);
-        outputStream.write(outputInitPacket.toByteArray());
-        outputStream.flush();
+    /**
+     * Create App BIN from HEX
+     */
+    private int createAppBin( int hardwareType) throws IOException {
+        File appHexFile = new File( getCachePathAppHex());
+        File appBinFile = new File( getCachePathAppBin());
 
-        // Should return from here
-        return initPacket.getAbsolutePath();
+        byte [] appHex = FileUtils.readBytesFromFile( appHexFile);
+        if ( appHex == null) {
+            return -1;
+        }
+        irmHexUtils hexUtils = new irmHexUtils();
+        int hexBlock = hardwareType == MICROBIT_V1
+                ? irmHexUtils.irmHexBlock01
+                : irmHexUtils.irmHexBlock03;
+        if ( !hexUtils.applicationHexToData( appHex, hexBlock)) {
+            return -1;
+        }
+        if ( !FileUtils.writeBytesToFile( appBinFile, hexUtils.resultData)) {
+            return -1;
+        }
+        return hexUtils.resultData.length;
     }
 
     /**
      * Process Universal Hex
      * @return
      */
-    private String[] universalHexToDFU(String inputPath, int hardwareType) {
+    private int universalHexToDFU( String inputPath, int hardwareType) {
         logi("universalHexToDFU");
         try {
-            FileInputStream fis = new FileInputStream(inputPath);
-            int fileSize = Integer.valueOf(FileUtils.getFileSize(inputPath));
-            byte[] bs = new byte[fileSize];
-            int i = 0;
-            i = fis.read(bs);
-
-            logi("universalHexToDFU - read file");
+            File inputHexFile = new File( inputPath);
+            byte [] inputHex = FileUtils.readBytesFromFile( inputHexFile);
+            if ( inputHex == null) {
+                return -1;
+            }
+            logi("universalHexToDFU - file read");
 
             irmHexUtils irmHexUtil = new irmHexUtils();
             int hexBlock = hardwareType == MICROBIT_V1
                     ? irmHexUtils.irmHexBlock01
                     : irmHexUtils.irmHexBlock03;
-            if ( !irmHexUtil.universalHexToApplicationHex( bs, hexBlock)) {
-                return new String[]{"-1", "-1"};
+            if ( !irmHexUtil.universalHexToApplicationHex( inputHex, hexBlock)) {
+                return -1;
             }
-            byte [] dataHex = irmHexUtil.resultHex;
-            int application_size = irmHexUtil.resultDataSize;
             logi("universalHexToDFU - Finished parsing HEX");
 
-            try {
-                File hexToFlash = new File(this.getCacheDir() + "/application.hex");
-                if (hexToFlash.exists()) {
-                    hexToFlash.delete();
-                }
-                hexToFlash.createNewFile();
-
-                FileOutputStream outputStream = new FileOutputStream(hexToFlash);
-                outputStream.write( dataHex);
-                outputStream.flush();
-
-                // Should return from here
-                Log.v(TAG, hexToFlash.getAbsolutePath());
-                String[] ret = new String[2];
-                ret[0] = hexToFlash.getAbsolutePath();
-                ret[1] = Integer.toString(application_size);
-
-                logi("universalHexToDFU - Finished");
-                return ret;
-            } catch (IOException e) {
-                e.printStackTrace();
+            File hexFile = new File( getCachePathAppHex());
+            if ( !FileUtils.writeBytesToFile( hexFile, irmHexUtil.resultHex)) {
+                return -1;
             }
+            // Should return from here
+            logi("universalHexToDFU - Finished");
+            return irmHexUtil.resultDataSize;
 
-        } catch (FileNotFoundException e) {
-            Log.e(TAG, "File not found.");
-            e.printStackTrace();
-        } catch (IOException e) {
-            Log.e(TAG, "IO Exception.");
+        } catch ( Exception e) {
             e.printStackTrace();
         }
-
         // Should not reach this
-        return new String[]{"-1", "-1"};
+        return -1;
     }
 
 //    /**

From b9d4779e4943934401b675d6eb7ff9b61994ce06 Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Tue, 12 Mar 2024 20:04:42 +0000
Subject: [PATCH 12/13] Version 3.0.2 (52)

---
 app/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index daf75bc5..5a598110 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,8 +14,8 @@
   limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="51"
-    android:versionName="3.0.1">
+    android:versionCode="52"
+    android:versionName="3.0.2">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

From c4f5e05aee2649ea86f815e03f790340c043cd69 Mon Sep 17 00:00:00 2001
From: Martin Williams <martinwork@users.noreply.github.com>
Date: Wed, 13 Mar 2024 10:20:58 +0000
Subject: [PATCH 13/13] Accept suggested library upgrades

---
 app/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fca581e9..002667b9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,14 +25,14 @@ android {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19'
     implementation 'no.nordicsemi.android:dfu:2.4.1'
     implementation project(':pfLibrary')
-    implementation 'com.google.android.gms:play-services-analytics:9.2.0'
+    implementation 'com.google.android.gms:play-services-analytics:18.0.4'
     implementation 'com.google.code.gson:gson:2.8.2'
-    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 }