From f5019ba96647bd1c33153e6e9099d21dcf47bfa7 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 15 Oct 2014 22:08:13 +0200
Subject: detect deleted files on start up. got rid of lagecy image provider
 for performance reasons. NOTE: this will prevent you to access images older
 than version 0.6

---
 AndroidManifest.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ce4ea5df..3263cdd6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,11 +25,6 @@
         android:theme="@style/ConversationsTheme" >
         <service android:name="eu.siacs.conversations.services.XmppConnectionService" />
 
-        <provider
-            android:name="eu.siacs.conversations.services.ImageProvider"
-            android:authorities="eu.siacs.conversations.images"
-            android:exported="true" />
-
         <receiver android:name="eu.siacs.conversations.services.EventReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -124,4 +119,4 @@
         <activity android:name="de.duenndns.ssl.MemorizingActivity" />
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
-- 
cgit v1.2.3


From 5c2a79361a937b076bfd33b52d6c3230cc295a3d Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Thu, 16 Oct 2014 10:54:05 -0400
Subject: Fix problem when merging manifests

---
 AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3263cdd6..d65f747e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="eu.siacs.conversations"
     android:versionCode="31"
     android:versionName="0.7.3" >
@@ -22,6 +23,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
+        tools:replace="android:label"
         android:theme="@style/ConversationsTheme" >
         <service android:name="eu.siacs.conversations.services.XmppConnectionService" />
 
-- 
cgit v1.2.3


From 9f9c3d3c2f449c8200309bf34ee40c75c9e02c16 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 22 Oct 2014 00:00:19 +0200
Subject: changed version to 0.8 alpha

---
 AndroidManifest.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d65f747e..a66de8ba 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="eu.siacs.conversations"
-    android:versionCode="31"
-    android:versionName="0.7.3" >
+    android:versionCode="32"
+    android:versionName="0.8-alpha" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -121,4 +121,4 @@
         <activity android:name="de.duenndns.ssl.MemorizingActivity" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
-- 
cgit v1.2.3