Update to v2.2.8

BasicAirData · Oct 21, 2020 · 84f4862 · 84f4862
2 parents ba36a49 + 75f35e7
commit 84f4862
Show file tree

Hide file tree

Showing 20 changed files with 206 additions and 236 deletions.
diff --git a/apk/GPSLogger-2.2.8.apk b/apk/GPSLogger-2.2.8.apk
diff --git a/apk/GPSLogger-latest.apk b/apk/GPSLogger-latest.apk
diff --git a/app/app.iml b/app/app.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -33,8 +33,14 @@ android {
         applicationId "eu.basicairdata.graziano.gpslogger"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 31
-        versionName '2.2.7'
+        versionCode 32
+        versionName '2.2.8'
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [ eventBusIndex : 'eu.basicairdata.graziano.gpslogger.EventBusIndex' ]
+            }
+        }
     }
     buildTypes {
         debug {
@@ -57,10 +63,13 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'org.greenrobot:eventbus:3.1.1'
     implementation 'com.android.support:cardview-v7:28.0.0'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
     implementation 'com.android.support:preference-v7:28.0.0'
     implementation 'com.android.support:preference-v14:28.0.0'
     implementation 'com.github.bumptech.glide:glide:3.8.0'
+
+    def eventbus_version = '3.1.1'
+    implementation "org.greenrobot:eventbus:$eventbus_version"
+    annotationProcessor "org.greenrobot:eventbus-annotation-processor:$eventbus_version"
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -25,4 +25,10 @@
     public static int e(...);
 }
 
+-keepattributes *Annotation*
+-keepclassmembers class * {
+    @org.greenrobot.eventbus.Subscribe <methods>;
+}
+-keep enum org.greenrobot.eventbus.ThreadMode { *; }
+
 -dontobfuscate
diff --git a/app/src/main/java/eu/basicairdata/graziano/gpslogger/DatabaseHandler.java b/app/src/main/java/eu/basicairdata/graziano/gpslogger/DatabaseHandler.java
@@ -329,12 +329,15 @@ public void addLocationToTrack(LocationExtended location, Track track) {
 
         trkvalues.put(KEY_TRACK_VALIDMAP, track.getValidMap());
 
-        db.beginTransaction();
-        db.insert(TABLE_LOCATIONS, null, locvalues);                // Insert the new Location
-        db.update(TABLE_TRACKS, trkvalues, KEY_ID + " = ?",
-                new String[] { String.valueOf(track.getId()) });    // Update the corresponding Track
-        db.setTransactionSuccessful();
-        db.endTransaction();
+        try {
+            db.beginTransaction();
+            db.insert(TABLE_LOCATIONS, null, locvalues);                // Insert the new Location
+            db.update(TABLE_TRACKS, trkvalues, KEY_ID + " = ?",
+                    new String[] { String.valueOf(track.getId()) });    // Update the corresponding Track
+            db.setTransactionSuccessful();
+        } finally {
+            db.endTransaction();
+        }
 
         //Log.w("myApp", "[#] DatabaseHandler.java - addLocation: Location " + track.getNumberOfLocations() + " added into track " + track.getID());
     }
@@ -416,12 +419,15 @@ public void addPlacemarkToTrack(LocationExtended placemark, Track track) {
 
         trkvalues.put(KEY_TRACK_VALIDMAP, track.getValidMap());
 
-        db.beginTransaction();
-        db.insert(TABLE_PLACEMARKS, null, locvalues);                // Insert the new Location
-        db.update(TABLE_TRACKS, trkvalues, KEY_ID + " = ?",
-                new String[] { String.valueOf(track.getId()) });    // Update the corresponding Track
-        db.setTransactionSuccessful();
-        db.endTransaction();
+        try {
+            db.beginTransaction();
+            db.insert(TABLE_PLACEMARKS, null, locvalues);                // Insert the new Location
+            db.update(TABLE_TRACKS, trkvalues, KEY_ID + " = ?",
+                    new String[] { String.valueOf(track.getId()) });    // Update the corresponding Track
+            db.setTransactionSuccessful();
+        } finally {
+            db.endTransaction();
+        }
 
         //Log.w("myApp", "[#] DatabaseHandler.java - addLocation: Location " + track.getNumberOfLocations() + " added into track " + track.getID());
     }
@@ -684,15 +690,18 @@ public long getLastLocationID(long TrackID) {
     // The method deletes also Placemarks and Locations associated to the specified track
     public void DeleteTrack(long TrackID) {
         SQLiteDatabase db = this.getWritableDatabase();
-        db.beginTransaction();
-        db.delete(TABLE_PLACEMARKS, KEY_TRACK_ID + " = ?",
-                new String[] { String.valueOf(TrackID) });    // Delete track's Placemarks
-        db.delete(TABLE_LOCATIONS, KEY_TRACK_ID + " = ?",
-                new String[] { String.valueOf(TrackID) });    // Delete track's Locations
-        db.delete(TABLE_TRACKS, KEY_ID + " = ?",
-                new String[] { String.valueOf(TrackID) });    // Delete track
-        db.setTransactionSuccessful();
-        db.endTransaction();
+        try {
+            db.beginTransaction();
+            db.delete(TABLE_PLACEMARKS, KEY_TRACK_ID + " = ?",
+                    new String[] { String.valueOf(TrackID) });    // Delete track's Placemarks
+            db.delete(TABLE_LOCATIONS, KEY_TRACK_ID + " = ?",
+                    new String[] { String.valueOf(TrackID) });    // Delete track's Locations
+            db.delete(TABLE_TRACKS, KEY_ID + " = ?",
+                    new String[] { String.valueOf(TrackID) });    // Delete track
+            db.setTransactionSuccessful();
+        } finally {
+            db.endTransaction();
+        }
 
         //Log.w("myApp", "[#] DatabaseHandler.java - addLocation: Location " + track.getNumberOfLocations() + " added into track " + track.getID());
     }

diff --git a/app/src/main/java/eu/basicairdata/graziano/gpslogger/ExternalViewerChecker.java b/app/src/main/java/eu/basicairdata/graziano/gpslogger/ExternalViewerChecker.java
@@ -31,10 +31,9 @@
 
 public class ExternalViewerChecker {
 
-    private Context context;
-    private boolean isAppInfoListMade = false;
+    private final Context context;
 
-    public ArrayList<AppInfo> appInfoList = new ArrayList<>();
+    private ArrayList<AppInfo> appInfoList = new ArrayList<>();
 
     static private class CustomComparator implements Comparator<AppInfo> {
         @Override
@@ -43,7 +42,12 @@ public int compare(AppInfo o1, AppInfo o2) {
         }
     }
 
-    private CustomComparator Comparator = new CustomComparator();
+
+    public ArrayList<AppInfo> getAppInfoList() {
+        return appInfoList;
+    }
+
+    private final CustomComparator Comparator = new CustomComparator();
 
 
     public ExternalViewerChecker(Context context) {
@@ -61,16 +65,10 @@ public boolean isEmpty() {
     }
 
 
-    public AppInfo getAppInfo (int index) {
-        if (index < size()) return appInfoList.get(index);
-        else return null;
-    }
-
-
     public void makeAppInfoList() {
         final PackageManager pm = context.getPackageManager();
 
-        appInfoList.clear();
+        appInfoList = new ArrayList<>();
 
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -112,6 +110,7 @@ public void makeAppInfoList() {
                 if (a.Label.equals(ainfo.Label) && a.PackageName.equals(ainfo.PackageName)) {
                     found = true;
                     //a.KML = true;
+                    break;
                 }
             }
             if (!found) {
@@ -136,7 +135,5 @@ public void makeAppInfoList() {
                 }
             }
         }
-
-        isAppInfoListMade = true;
     }
 }