Merge branch 'protected/single-headlines-list' into 'master'

use one instance of loaded articles and keep it in an application singleton

See merge request tt-rss/tt-rss-android!31

1 files changed, 0 insertions, 11 deletions

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 0f66928f..61ea11bf 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -10,24 +10,17 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
         android:name=".Application"
         android:allowBackup="true"
-        android:backupAgent=".util.PrefsBackupAgent"
-        android:fullBackupOnly="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config" >
 
-        <!-- <meta-data android:name="com.bumptech.glide.integration.okhttp3.OkHttpGlideModule"
-            tools:node="remove" /> -->
         <meta-data android:name="org.fox.ttrss.glide.OkHttpProgressGlideModule"
             android:value="GlideModule" />
 
@@ -196,10 +189,6 @@
             </intent-filter>
         </activity>
 
-        <meta-data
-            android:name="com.google.android.backup.api_key"
-            android:value="AEdPqrEAAAAIwG6zsGB4qo6ZhjfwIJpm9WI7AqmWaoRXm6ZJnA" />
-
         <receiver android:name=".util.DeviceBootReceiver" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />