From 94f514f95875ec84f83cacc8229a78c2ae9b222d Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sun, 12 Oct 2014 18:18:36 +0200
Subject: [PATCH] Fixed manifests

---
 app/src/androidTest/assets/testfile.mp3       | Bin 0 -> 20606 bytes
 app/src/main/AndroidManifest.xml              |  53 ++----------------
 .../java/de/danoeh/antennapod/PodcastApp.java |   9 +++
 core/src/main/AndroidManifest.xml             |  51 ++++++++++++++++-
 4 files changed, 64 insertions(+), 49 deletions(-)
 create mode 100644 app/src/androidTest/assets/testfile.mp3

diff --git a/app/src/androidTest/assets/testfile.mp3 b/app/src/androidTest/assets/testfile.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..f15faadf3eaad3d64b136647a7534475867a4d91
GIT binary patch
literal 20606
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
X25|*^f3ge$mO4+M|NN}~!WsS-Gfh9(

literal 0
HcmV?d00001

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3410d9d53..7de13e7c1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="de.danoeh.antennapod"
-          android:versionCode="40"
-          android:versionName="0.9.9.3">
+    package="de.danoeh.antennapod"
+    android:versionCode="40"
+    android:versionName="0.9.9.3">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
-
-    <uses-sdk
-        android:minSdkVersion="10"
-        android:targetSdkVersion="19"/>
-
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <supports-screens
@@ -74,20 +69,6 @@
             android:name=".activity.DownloadAuthenticationActivity"
             android:launchMode="singleInstance"/>
 
-        <service
-            android:name=".core.service.download.DownloadService"
-            android:enabled="true"/>
-        <service
-            android:name=".core.service.playback.PlaybackService"
-            android:enabled="true"
-            android:exported="true">
-        </service>
-
-        <service
-            android:name=".core.service.GpodnetSyncService"
-            android:enabled="true">
-        </service>
-
         <activity
             android:name=".activity.PreferenceActivity"
             android:configChanges="keyboardHidden|orientation"
@@ -97,17 +78,6 @@
                 android:value="de.danoeh.antennapod.activity.MainActivity"/>
         </activity>
 
-        <receiver
-            android:name=".core.receiver.MediaButtonReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON"/>
-            </intent-filter>
-            <intent-filter>
-                <action android:name="de.danoeh.antennapod.NOTIFY_BUTTON_RECEIVER"/>
-            </intent-filter>
-        </receiver>
-
         <activity android:name=".activity.FeedInfoActivity">
         </activity>
 
@@ -133,11 +103,6 @@
                 <action android:name="de.danoeh.antennapod.STOP_WIDGET_UPDATE"/>
             </intent-filter>
         </receiver>
-        <receiver android:name=".core.receiver.FeedUpdateReceiver">
-            <intent-filter>
-                <action android:name="de.danoeh.antennapod.feedupdatereceiver.refreshFeeds"/>
-            </intent-filter>
-        </receiver>
 
         <activity android:name=".activity.StorageErrorActivity">
         </activity>
@@ -323,13 +288,12 @@
                 android:value="de.danoeh.antennapod.activity.PreferenceActivity"/>
         </activity>
 
-
-        <receiver android:name=".core.receiver.ConnectivityActionReceiver">
+        <receiver android:name=".receiver.SPAReceiver">
             <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+                <action android:name="de.danoeh.antennapdsp.intent.SP_APPS_QUERY_FEEDS_RESPONSE"/>
             </intent-filter>
         </receiver>
-        <receiver android:name=".core.receiver.AlarmUpdateReceiver">
+        <receiver android:name="de.danoeh.antennapod.core.receiver.AlarmUpdateReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
@@ -341,11 +305,6 @@
                     android:scheme="package"/>
             </intent-filter>
         </receiver>
-        <receiver android:name=".receiver.SPAReceiver">
-            <intent-filter>
-                <action android:name="de.danoeh.antennapdsp.intent.SP_APPS_QUERY_FEEDS_RESPONSE"/>
-            </intent-filter>
-        </receiver>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index 12213d6f9..87474dbdd 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -11,6 +11,15 @@ import de.danoeh.antennapod.spa.SPAUtil;
 /** Main application class. */
 public class PodcastApp extends Application {
 
+    // make sure that ClientConfigurator executes its static code
+    static {
+        try {
+            Class.forName("de.danoeh.antennapod.config.ClientConfigurator");
+        } catch (Exception e) {
+            throw new RuntimeException("ClientConfigurator not found");
+        }
+    }
+
 	private static final String TAG = "PodcastApp";
 
 	private static float LOGICAL_DENSITY;
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index db67b8003..006b3f123 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -1,10 +1,57 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.danoeh.antennapod.core">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+
     <application android:allowBackup="true"
         android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
->
+        android:icon="@drawable/ic_launcher">
+
+        <service
+            android:name=".service.download.DownloadService"
+            android:enabled="true"/>
+        <service
+            android:name=".service.playback.PlaybackService"
+            android:enabled="true"
+            android:exported="true">
+        </service>
+        <service
+            android:name=".service.GpodnetSyncService"
+            android:enabled="true">
+        </service>
+
+        <receiver
+            android:name=".receiver.MediaButtonReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="de.danoeh.antennapod.NOTIFY_BUTTON_RECEIVER"/>
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name=".receiver.ConnectivityActionReceiver">
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".receiver.AlarmUpdateReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_REPLACED"/>
+                <data
+                    android:path="de.danoeh.antennapod"
+                    android:scheme="package"/>
+            </intent-filter>
+        </receiver>
 
     </application>