Merge pull request #14 from superus8r/hotfix/superuser/FixCrashOnConnectionLost

[Hotfix] fix crash on device connection lost event

Author: superus8r

.circleci/config.yml

@@ -0,0 +1,59 @@
+version: 2.1
+
+jobs:
+  android-test:
+    macos:
+      xcode: "11.2.0"
+    working_directory: ~/repo/App
+    steps:
+      - checkout:
+          path: ~/repo
+
+      - run:
+          name: set ANDROID_SDK_ROOT
+          command: |
+            echo 'export ANDROID_SDK_ROOT=$HOME/android-tools'  >> $BASH_ENV
+
+      - restore_cache:
+          key: android=tools-v1-{{ checksum "scripts/install-android-tools.sh" }}-{{ arch }}
+
+      - run:
+          name: install android tools
+          command: |
+            sh scripts/install-android-tools.sh
+            echo 'export PATH=$ANDROID_SDK_ROOT/tools/bin:$PATH'  >> $BASH_ENV
+            echo 'export PATH=$ANDROID_SDK_ROOT/tools:$PATH'  >> $BASH_ENV
+            echo 'export PATH=$ANDROID_SDK_ROOT/platform-tools:$PATH'  >> $BASH_ENV
+            echo 'export PATH=$ANDROID_SDK_ROOT/emulator:$PATH'  >> $BASH_ENV
+            source $BASH_ENV
+            sdkmanager --list
+
+      - save_cache:
+          key: android=tools-v1-{{ checksum "scripts/install-android-tools.sh" }}-{{ arch }}
+          paths:
+            - /Users/distiller/android-tools
+
+      - run:
+          name: create AVD
+          command: make create-avd
+
+      - run:
+          name: start AVD
+          command: emulator-headless -avd android-tablet
+          background: true
+
+      - run:
+          name: wait for emulator
+          command: adb wait-for-device shell 'while [[ -z $(getprop dev.bootcomplete) ]]; do sleep 1; done;'
+
+      - run: adb shell screencap -p > screenshots/before.png
+
+      # (insert testing here)
+
+      - store_artifacts:
+          path: screenshots
+
+workflows:
+  workflow:
+    jobs:
+      - android-test

.gitignore

@@ -95,3 +95,4 @@ app/build.gradle
 .idea/misc.xml
 .idea/.name
 .idea/codeStyles/Project.xml
+.idea/misc.xml

.idea/misc.xml

@@ -24,7 +24,8 @@
  The Joystick is removed for the first release.
 
  ## Tests
- Under Construction
+ Currently, there are some basic tests to run on the CI, but needs improvements.
+ UI tests will be completed once the project is migrated to Jetpack Compose.
 
  ## Sentry Reports
  The project uses Sentry for the crash reports, if this is not needed, you can remove the following line in `AndroidManifest.xml`:

README.md

@@ -3,7 +3,6 @@ apply plugin: 'kotlin-android'
 apply plugin: 'koin'
 
 repositories {
-    jcenter()
 }
 
 android {
@@ -18,9 +17,8 @@ android {
         applicationId "org.kabiri.android.usbterminal"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 8
-        versionName "0.7.1"
-
+        versionCode 9
+        versionName "0.7.9"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

app/build.gradle

@@ -62,7 +62,17 @@ class ArduinoHelper(private val context: Context,
                     _liveInfoOutput.postValue(context.getString(R.string.helper_info_usb_permission_requested))
                 } else {
                     _liveErrorOutput.postValue(context.getString(R.string.helper_error_device_not_found))
-                    connection.close()
+                    try {
+                        connection.close()
+                    } catch (e: UninitializedPropertyAccessException) {
+                        _liveErrorOutput.postValue(context.getString(
+                            R.string.helper_error_connection_not_ready_to_close))
+                        _liveErrorOutput.postValue(e.message)
+                    } catch (e: Exception) {
+                        _liveErrorOutput.postValue(context.getString(
+                            R.string.helper_error_connection_failed_to_close))
+                        _liveErrorOutput.postValue(e.message)
+                    }
                 }
             }
         } else {

app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt

@@ -18,6 +18,8 @@
     <string name="helper_error_serial_connection_not_opened">\nPort not opened - There might be a problem with the serial connection to Arduino</string>
     <string name="helper_error_write_problem">Serial Write encountered an error:</string>
     <string name="helper_error_connection_closed_unexpectedly">Device connection was closed unexpectedly</string>
+    <string name="helper_error_connection_not_ready_to_close">No device connection to close</string>
+    <string name="helper_error_connection_failed_to_close">Device connection failed to close</string>
     <string name="helper_info_serial_connection_opened">\nSerial Connection Opened</string>
     <string name="helper_info_usb_permission_requested">Requested permission to access the USB device…</string>
     <string name="helper_info_checking_attached_usb_devices">\nChecking attached USB devices…</string>

app/src/main/res/values/strings.xml

@@ -0,0 +1,26 @@
+if [ -d $ANDROID_SDK_ROOT ]
+then
+    echo "Directory $ANDROID_SDK_ROOT already exists so we're skipping the install. If you'd like to install fresh tools, edit this script to invalidate the CI cache."
+    exit 0
+fi
+
+mkdir -p $ANDROID_SDK_ROOT
+cd $ANDROID_SDK_ROOT
+curl https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip -o sdk-tools.zip
+
+unzip sdk-tools.zip
+
+mkdir -p "$ANDROID_SDK_ROOT/licenses"
+
+echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_SDK_ROOT/licenses/android-sdk-license"
+echo "84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_SDK_ROOT/licenses/android-sdk-preview-license"
+echo "d975f751698a77b662f1254ddbeed3901e976f5a" > "$ANDROID_SDK_ROOT/licenses/intel-android-extra-license"
+
+SDKMANAGER=$ANDROID_SDK_ROOT/tools/bin/sdkmanager
+
+$SDKMANAGER "platform-tools"
+$SDKMANAGER "platforms;android-29"
+$SDKMANAGER "build-tools;29.0.2"
+$SDKMANAGER "ndk-bundle"
+$SDKMANAGER "system-images;android-29;google_apis;x86_64"
+$SDKMANAGER "emulator"