commit e00f08963b61589418eb823f579fd49567fdae34
author Tom Hennen <TomHennen@users.noreply.github.com> Fri Jan 29 17:06:16 2016 -0500
committer Tom Hennen <TomHennen@users.noreply.github.com> Fri Jan 29 17:06:16 2016 -0500
tree 76a11f215a3f8c3dccd8db2f241352d624a5fa25
parent 65c335a707fcef542c79be89e6c2daa619b596fa
parent d1eaf72791799dd1750009d13cd16f9f62070e5b

Merge pull request #1626 from mfietz/replace_prestissimo_with_sonic

Switch Prestissimo users to Sonic

app/src/main/AndroidManifest.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4e78637..9d7bbee 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="1050003"
-    android:versionName="1.5.0.3">
+    android:versionCode="1050004"
+    android:versionName="1.5.0.4">
     <!--
       Version code schema:
       "1.2.3-SNAPSHOT" -> 1020300

app/src/main/java/de/danoeh/antennapod/PodcastApp.java

diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index c1d4bc4..829a49a 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -57,8 +57,8 @@
 		singleton = this;
 
 		PodDBAdapter.init(this);
-		UpdateManager.init(this);
 		UserPreferences.init(this);
+		UpdateManager.init(this);
 		PlaybackPreferences.init(this);
 		NetworkUtils.init(this);
 		EventDistributor.getInstance();

app/src/main/java/de/danoeh/antennapod/UpdateManager.java

diff --git a/app/src/main/java/de/danoeh/antennapod/UpdateManager.java b/app/src/main/java/de/danoeh/antennapod/UpdateManager.java
index b1d7fff..0b3c433 100644
--- a/app/src/main/java/de/danoeh/antennapod/UpdateManager.java
+++ b/app/src/main/java/de/danoeh/antennapod/UpdateManager.java
@@ -5,14 +5,18 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.util.Log;
 
+import org.antennapod.audio.MediaPlayer;
+
 import java.io.File;
 import java.util.List;
 
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 
@@ -83,6 +87,11 @@
                 }
             }.start();
         }
+        if(oldVersionCode < 1050004) {
+            if(MediaPlayer.isPrestoLibraryInstalled(context) && Build.VERSION.SDK_INT >= 16) {
+                UserPreferences.enableSonic(true);
+            }
+        }
     }
 
 }