Merge branch 'dev'

Author: hauke96

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "de.hauke_stieler.geonotes"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 1003000
-        versionName "1.3.0"
+        versionCode 1003001
+        versionName "1.3.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -40,6 +40,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.preference:preference:1.1.1'
+    implementation 'org.apache.commons:commons-text:1.9'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-inline:3.8.0'

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

@@ -230,10 +230,15 @@ private void initAndSelectMarker(GeoPoint location) {
 
     /**
      * Tries to snap the location to the last known GPS of the distance on the screen is below 50dp.
+     * If no GPS location available or if the distance to the current GPS location is lower than 50dp, then the GPS location is returned, otherwise the input is returned.
      *
-     * @return If distance <50dp then GPS location is returned, if not, the input is returned.
+     * @return The new location, snapped if possible.
      */
     private GeoPoint snapToGpsLocation(GeoPoint location) {
+        if (gpsLocationProvider.getLastKnownLocation() == null) {
+            return location;
+        }
+
         GeoPoint gpsLocation = new GeoPoint(gpsLocationProvider.getLastKnownLocation());
 
         Point markerLocationOnScreen = map.getProjection().toPixels(location, null);

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

@@ -30,6 +30,7 @@
 
 import androidx.core.content.FileProvider;
 
+import org.apache.commons.text.StringEscapeUtils;
 import org.osmdroid.api.IMapView;
 import org.osmdroid.views.MapView;
 import org.osmdroid.views.overlay.Marker;
@@ -189,6 +190,8 @@ public void onOpen(Object item) {
         if (snippet == null) {
             snippet = "";
         }
+        snippet = StringEscapeUtils.escapeHtml4(snippet).replace("\n", "<br>");
+
         Spanned snippetHtml = Html.fromHtml(snippet);
         EditText descriptionView = mView.findViewById(mDescriptionId /*R.id.description*/);
         if (descriptionView != null) {

metadata/en-US/changelogs/1003001.txt

@@ -0,0 +1,4 @@
+1.3.1:
+
+* Fix rotation bug and resulting crash
+* Fix line break bug in note description