projectFilePath null check

Author: microbit-sam

.idea/gradle.xml

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "com.samsung.microbit"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
     }
     buildTypes {
         release {

app/build.gradle

@@ -15,8 +15,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.samsung.microbit"
-          android:versionCode="30"
-          android:versionName="2.8.1">
+          android:versionCode="33"
+          android:versionName="2.8.2">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

app/src/main/AndroidManifest.xml

@@ -1113,16 +1113,13 @@ public void onClick(final View v) {
                 logi("onClick() :: connectBtn");
                 Toast.makeText(MBApp.getApp(), getString(R.string.no_longer_required_to_connect), Toast.LENGTH_LONG).show();
 
-                break;
-                /*
                 if(!BluetoothChecker.getInstance().isBluetoothON()) {
                     setActivityState(PairingActivityState.STATE_ENABLE_BT_FOR_CONNECT);
                     enableBluetooth();
                     return;
                 }
                 toggleConnection();
                 break;
-                 */
 
             //TODO: there is no ability to delete paired device on Connect screen, so add or remove the case.
             // Delete Microbit

app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java

@@ -46,26 +46,28 @@ public static int findProjectssAndPopulate(HashMap<String, String> prettyFileNam
         int totalPrograms = 0;
         if(sdcardDownloads.exists()) {
             File files[] = sdcardDownloads.listFiles();
-            for(File file : files) {
-                String fileName = file.getName();
-                if(fileName.endsWith(".hex")) {
+            if (files != null) {
+                for (File file : files) {
+                    String fileName = file.getName();
+                    if (fileName.endsWith(".hex")) {
 
-                    //Beautify the filename
-                    String parsedFileName;
-                    int dot = fileName.lastIndexOf(".");
-                    parsedFileName = fileName.substring(0, dot);
-                    parsedFileName = parsedFileName.replace('_', ' ');
+                        //Beautify the filename
+                        String parsedFileName;
+                        int dot = fileName.lastIndexOf(".");
+                        parsedFileName = fileName.substring(0, dot);
+                        parsedFileName = parsedFileName.replace('_', ' ');
 
-                    if(prettyFileNameMap != null) {
-                        prettyFileNameMap.put(parsedFileName, fileName);
-                    }
+                        if (prettyFileNameMap != null) {
+                            prettyFileNameMap.put(parsedFileName, fileName);
+                        }
 
-                    if(list != null) {
-                        list.add(new Project(parsedFileName, file.getAbsolutePath(), file.lastModified(),
-                                null, false));
-                    }
+                        if (list != null) {
+                            list.add(new Project(parsedFileName, file.getAbsolutePath(), file.lastModified(),
+                                    null, false));
+                        }
 
-                    ++totalPrograms;
+                        ++totalPrograms;
+                    }
                 }
             }
         }

app/src/main/java/com/samsung/microbit/utils/ProjectsHelper.java

@@ -5,7 +5,7 @@ buildscript {
 	    jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'com.google.gms:google-services:3.0.0'
     }
 }

build.gradle

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip