Handling absence of profile name on start

mendhak · Mar 17, 2016 · 3900ae2 · 3900ae2
1 parent 9417773
commit 3900ae2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/gpslogger/src/main/AndroidManifest.xml b/gpslogger/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
         android:icon="@drawable/gpsloggericon3"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        android:name=".common.AppSettings"
+        android:name="com.mendhak.gpslogger.common.AppSettings"
         >
         <meta-data
             android:name="com.google.android.gms.version"

diff --git a/gpslogger/src/main/java/com/mendhak/gpslogger/GpsMainActivity.java b/gpslogger/src/main/java/com/mendhak/gpslogger/GpsMainActivity.java
@@ -561,6 +561,10 @@ public boolean accept(File file, String fileName) {
             }
         });
 
+        if(propertyFiles == null){
+            return;
+        }
+
         for(File propertyFile: propertyFiles){
 
             String name = propertyFile.getName();
-Original file line number
+Diff line change
@@ Expand Up / @@ -561,6 +561,10 @@ public boolean accept(File file, String fileName) { @@
                 }
             });
+            if(propertyFiles == null){
+                return;
+            }
             for(File propertyFile: propertyFiles){
                 String name = propertyFile.getName();
@@ Expand Down @@