From 45a26d5003dda8350498d2754f3c120afe2e0a01 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Mon, 14 Mar 2016 13:09:02 +0100
Subject: Prevent NumberFormatException

---
 .../java/de/danoeh/antennapod/activity/MediaplayerActivity.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 81ba8169f..61815757f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -882,7 +882,13 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
 
     private void updateButPlaybackSpeed() {
         if (controller != null && butPlaybackSpeed != null) {
-            float speed = Float.valueOf(UserPreferences.getPlaybackSpeed());
+            float speed = 1.0f;
+            try {
+                speed = Float.parseFloat(UserPreferences.getPlaybackSpeed());
+            } catch(NumberFormatException e) {
+                Log.e(TAG, Log.getStackTraceString(e));
+                UserPreferences.setPlaybackSpeed(String.valueOf(speed));
+            }
             String speedStr = String.format("%.2fx", speed);
             butPlaybackSpeed.setText(speedStr);
         }
-- 
cgit v1.2.3


From 8317e6fcd8cb1986d7b8c71e72e1435516a1db95 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Mon, 14 Mar 2016 20:50:04 -0400
Subject: 1.5.2.0

---
 app/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f9275900..af23c287c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.danoeh.antennapod"
-    android:versionCode="1050104"
-    android:versionName="1.5.1.4">
+    android:versionCode="1050200"
+    android:versionName="1.5.2.0">
     <!--
       Version code schema:
       "1.2.3-SNAPSHOT" -> 1020300
-- 
cgit v1.2.3