From d2834ccfd11df88f93f6926544b1aa1dbff3c104 Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Sun, 3 Apr 2016 16:24:47 +0200
Subject: fixed installation error "W/PackageManager: Can't install because
 provider name de.thedevstack.conversationsplus (in package
 eu.siacs.conversations) is already used by de.thedevstack.conversationsplus"

---
 src/main/AndroidManifest.xml                         |  2 +-
 .../providers/ConversationsPlusFileProvider.java     | 20 --------------------
 .../providers/ConversationsPlusFileProvider.java     | 20 ++++++++++++++++++++
 .../conversations/ui/adapter/MessageAdapter.java     |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 src/main/java/de/thedevstack/conversationsplus/providers/ConversationsPlusFileProvider.java
 create mode 100644 src/main/java/eu/siacs/conversations/providers/ConversationsPlusFileProvider.java

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index db24a8c0..544739da 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -176,7 +176,7 @@
             </intent-filter>
         </service>
         <provider
-            android:authorities="de.thedevstack.conversationsplus"
+            android:authorities="eu.siacs.conversations"
             android:name=".providers.ConversationsPlusFileProvider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/src/main/java/de/thedevstack/conversationsplus/providers/ConversationsPlusFileProvider.java b/src/main/java/de/thedevstack/conversationsplus/providers/ConversationsPlusFileProvider.java
deleted file mode 100644
index 0b4ee5a3..00000000
--- a/src/main/java/de/thedevstack/conversationsplus/providers/ConversationsPlusFileProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package de.thedevstack.conversationsplus.providers;
-
-import android.net.Uri;
-import android.support.v4.content.FileProvider;
-
-import de.thedevstack.conversationsplus.ConversationsPlusApplication;
-import eu.siacs.conversations.entities.DownloadableFile;
-
-/**
- * Created by lookshe on 27.03.16.
- */
-public class ConversationsPlusFileProvider extends FileProvider {
-
-    private static final String SCHEME = "content";
-    private static final String AUTHORITY = "de.thedevstack.conversationsplus";
-
-    public static Uri createUriForPrivateFile(DownloadableFile file) {
-        return FileProvider.getUriForFile(ConversationsPlusApplication.getAppContext(), AUTHORITY, file);
-    }
-}
diff --git a/src/main/java/eu/siacs/conversations/providers/ConversationsPlusFileProvider.java b/src/main/java/eu/siacs/conversations/providers/ConversationsPlusFileProvider.java
new file mode 100644
index 00000000..2146ea53
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/providers/ConversationsPlusFileProvider.java
@@ -0,0 +1,20 @@
+package eu.siacs.conversations.providers;
+
+import android.net.Uri;
+import android.support.v4.content.FileProvider;
+
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import eu.siacs.conversations.entities.DownloadableFile;
+
+/**
+ * Created by lookshe on 27.03.16.
+ */
+public class ConversationsPlusFileProvider extends FileProvider {
+
+    private static final String SCHEME = "content";
+    private static final String AUTHORITY = "de.thedevstack.conversationsplus";
+
+    public static Uri createUriForPrivateFile(DownloadableFile file) {
+        return FileProvider.getUriForFile(ConversationsPlusApplication.getAppContext(), AUTHORITY, file);
+    }
+}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 478c0604..00554960 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -41,7 +41,7 @@ import java.util.regex.Pattern;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusColors;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
-import de.thedevstack.conversationsplus.providers.ConversationsPlusFileProvider;
+import eu.siacs.conversations.providers.ConversationsPlusFileProvider;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession;
 import eu.siacs.conversations.entities.Account;
-- 
cgit v1.2.3