Merge branch 'dev'

Author: hauke96

.idea/jarRepositories.xml

@@ -13,7 +13,7 @@ A simple and lightweight app to create and manage georeferenced notes (text and
 [<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="60">](https://apt.izzysoft.de/fdroid/index/apk/de.hauke_stieler.geonotes)
 [<img src="https://user-images.githubusercontent.com/663460/26973090-f8fdc986-4d14-11e7-995a-e7c5e79ed925.png" alt="Download APK from GitHub" height="60">](https://github.com/hauke96/geonotes/releases/latest)
 
-GeoNotes runs on Android 4.1 (SDK 16) and newer. There's no version at the Google Play store (yet).
+GeoNotes runs on Android 4.1 (SDK 16) and newer. There's an [F-Droid version](https://f-droid.org/en/packages/de.hauke_stieler.geonotes/) only (no version at the Google Play store yet).
 
 ## Need help?
 

README.md

@@ -4,14 +4,14 @@ plugins {
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "30.0.2"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "de.hauke_stieler.geonotes"
         minSdkVersion 16
         targetSdkVersion 32
-        versionCode 1005000
-        versionName "1.5.0"
+        versionCode 1005001
+        versionName "1.5.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/build.gradle

@@ -83,12 +83,17 @@ public enum State {
     private Spinner categorySpinner;
     private CategorySpinnerAdapter categorySpinnerAdapter;
 
-    private final Database database;
-    private final SharedPreferences preferences;
+    private Database database;
+    private SharedPreferences preferences;
 
     public MarkerFragment() {
         super(R.layout.marker_fragment);
+    }
 
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        Log.i("MarkerFragment", "onAttach: ");
         this.database = Injector.get(Database.class);
         this.preferences = Injector.get(SharedPreferences.class);
     }
@@ -303,6 +308,10 @@ public void addPhoto(File photo) {
     }
 
     public void reset() {
+        if (getView() == null) {
+            return;
+        }
+
         // First reset the marker, so that change events fired by input fields do not have any effect
         selectedMarker = null;
 

app/src/main/java/de/hauke_stieler/geonotes/map/MarkerFragment.java

@@ -3,9 +3,10 @@ buildscript {
     repositories {
         google()
         jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.3"
+        classpath 'com.android.tools.build:gradle:4.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -16,6 +17,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        mavenCentral()
     }
 }
 

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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+1.5.1:
+
+Behobene Fehler:
+* Absturz der App beim Start
+* F-Droid Build-Fehler behoben

metadata/de-DE/changelogs/1005001.txt

@@ -0,0 +1,5 @@
+1.5.1:
+
+Bug fixes:
+* Crash on startup
+* Fix F-Droid build error

metadata/en-US/changelogs/1005001.txt

@@ -0,0 +1,5 @@
+1.5.1:
+
+Bug fixes:
+* Crash on startup
+* Fix F-Droid build error