v1.5.437

sreichholf · Dec 18, 2019 · 2f55f97 · 2f55f97
1 parent bf5de6d
commit 2f55f97
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -67,10 +67,10 @@ android {
     buildToolsVersion project.BUILD_TOOLS_VERSION
 
     defaultConfig {
-        versionCode 436
-        versionName="1.5.436"
+        versionCode 437
+        versionName="1.5.437"
         minSdkVersion 17
-        targetSdkVersion 28
+        targetSdkVersion 29
         multiDexEnabled true
         sourceSets {
             main {

diff --git a/app/res/raw-de/changelog.md b/app/res/raw-de/changelog.md
@@ -1,7 +1,9 @@
-## 1.5.436
-* ENTFERNT: Auto-Theme-Wahl und mit ihr die Berechtigung für die grobe Position
-* ENTFERNT: Die Funktion "Spenden" wurde ersatzlos gestrichen (Da ~75% einer durch Google/Steuern aufgefressen werden)
+## 1.5.437
+* DEL: Auto-Theme-Wahl und mit ihr die Berechtigung für die grobe Position
+* DEL: Die Funktion "Spenden" wurde ersatzlos gestrichen (~75% einer Spende wurden durch Google/Steuern aufgefressen)
 * UPD: AndroidX Bibliotheken wurden auf Version 1.1 aktualisiert (wo verfügbar)
+* UPD: Wechsel auf Android 10 SDK
+* FIX: Abstürze wurden behoben
 
 ## 1.4.434
 * Das Tracking-Modul wurde vollständig entfernt (die bliebtesten Features sind mittlerweile hinreichend bekannt) und mit ihm die Datenschutzerklärung

diff --git a/app/res/raw/changelog.md b/app/res/raw/changelog.md
@@ -1,7 +1,9 @@
-## 1.5.436
-* DEL: Auto-Theme selection and with it the coarse location permission (deprected in latest google libraries)
-* DEL: Donations have been removed with no intention for any replacement (as 75% of any donation got eaten up by google and local taxes)
+## 1.5.437
+* DEL: Auto-Theme selection and with that the coarse location permission have been dropped
+* DEL: Donations have been removed with no intention for any replacement (~70% of any donation got eaten up by google and local taxes)
 * UPD: AndroidX libriaries updated to 1.1 where available
+* UPD: Built with Android 10 SDK
+* FIX: Some minor crashes have been fixed
 
 ## 1.4.434
 * Remove tracking/statistics module and everything related (Privacy statement is gone, too)

diff --git a/app/src/net/reichholf/dreamdroid/fragment/dialogs/EpgDetailBottomSheet.java b/app/src/net/reichholf/dreamdroid/fragment/dialogs/EpgDetailBottomSheet.java
@@ -64,15 +64,17 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         Bundle args = getArguments();
         mCurrentItem = (ExtendedHashMap) args.getSerializable(Event.class.getSimpleName());
         final boolean isNext = args.getBoolean("showNext", false);
-
+        String servicename = "";
+        String title = "N/A";
+        String date = null;
         String prefix = "";
-        if (isNext)
-            prefix = Event.PREFIX_NEXT;
-
-        String servicename = mCurrentItem.getString(Event.KEY_SERVICE_NAME);
-        String title = mCurrentItem.getString(prefix + Event.KEY_EVENT_TITLE);
-        String date = mCurrentItem.getString(prefix + Event.KEY_EVENT_START_READABLE);
-
+        if (mCurrentItem != null) {
+            if (isNext)
+                prefix = Event.PREFIX_NEXT;
+            servicename = mCurrentItem.getString(Event.KEY_SERVICE_NAME);
+            title = mCurrentItem.getString(prefix + Event.KEY_EVENT_TITLE);
+            date = mCurrentItem.getString(prefix + Event.KEY_EVENT_START_READABLE);
+        }
         if (!"N/A".equals(title) && date != null) {
             dialog = super.onCreateDialog(savedInstanceState);
             date = date.concat(" (" + mCurrentItem.getString(prefix + Event.KEY_EVENT_DURATION_READABLE) + " "