Merge pull request #1 from microbit-foundation/update-for-latest-nordic-dfu

Update for latest nordic dfu

Author: microbit-sam

build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 29
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 22
+        minSdkVersion 19
+        targetSdkVersion 29
     }
 
     buildTypes {

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.microbit.partialflashing"
     android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionName="1.1" >
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

src/main/java/org/microbit/android/partialflashing/HexUtils.java

@@ -3,17 +3,13 @@
 import android.util.Log;
 
 import java.io.BufferedReader;
-import java.io.EOFException;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.InterruptedIOException;
-
-import java.util.*;
-import java.util.List;
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
 
 
 /**
@@ -101,6 +97,29 @@ public int searchForData(String search) throws IOException {
         // Return -1 if no match
         return -1;
     }
+
+    /*
+     * A function to search for data in a hex file
+     * @param the _string_ of data to search for
+     * @return the index of the data. -1 if not found.
+     */
+    public int searchForDataRegEx(String search) throws IOException {
+        // Iterate through
+        ListIterator i = hexLines.listIterator();
+        while (i.hasNext()) {
+            // Have to call nextIndex() before next()
+            int index = i.nextIndex();
+
+            // Return index if successful
+            String match = i.next().toString();
+            if(match.matches(search)){
+                return index;
+            }
+        }
+
+        // Return -1 if no match
+        return -1;
+    }
 
     /*
      * Returns data from an index
@@ -130,6 +149,15 @@ public int getRecordAddressFromIndex(int index) throws IOException {
             return getRecordAddress(hexLines.get(index));
     }
 
+    /*
+    Used to get the data length from a record
+    @param Record as a String
+    @return Data length as a decimal / # of chars
+ */
+    public int getRecordDataLengthFromIndex(int index){
+        return getRecordDataLength(hexLines.get(index));
+    }
+
     /*
      * Returns segment address from an index
      * @param index