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"trz/beta-1

3 files changed, 3 insertions, 3 deletions

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/eu/siacs/conversations/providers/ConversationsPlusFileProvider.java
index 0b4ee5a3..2146ea53 100644
--- a/src/main/java/de/thedevstack/conversationsplus/providers/ConversationsPlusFileProvider.java
+++ b/src/main/java/eu/siacs/conversations/providers/ConversationsPlusFileProvider.java
@@ -1,4 +1,4 @@
-package de.thedevstack.conversationsplus.providers;
+package eu.siacs.conversations.providers;
 
 import android.net.Uri;
 import android.support.v4.content.FileProvider;
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;