aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/AndroidManifest.xml14
-rw-r--r--src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java2
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationActivity.java6
-rw-r--r--src/main/java/de/pixart/messenger/utils/GeoHelper.java2
-rw-r--r--src/playstore/AndroidManifest.xml2
5 files changed, 18 insertions, 8 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index e70b8cfae..44742fa38 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -205,11 +205,21 @@
<activity
android:name="de.pixart.messenger.ui.ShareLocationActivity"
- android:label="@string/share_location" />
+ android:label="@string/share_location" >
+ <intent-filter>
+ <action android:name="de.pixart.messenger.location.request" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
<activity
android:name="de.pixart.messenger.ui.ShowLocationActivity"
- android:label="@string/show_location" />
+ android:label="@string/show_location" >
+ <intent-filter>
+ <action android:name="de.pixart.messenger.location.show" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
<activity
android:name="de.pixart.messenger.ui.ShowFullscreenMessageActivity"
diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
index 302ad3164..3ebc6e06f 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
@@ -51,7 +51,7 @@ import de.pixart.messenger.xmpp.stanzas.IqPacket;
public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
- public static final String PEP_PREFIX = "eu.siacs.conversations.axolotl";
+ public static final String PEP_PREFIX = "de.pixart.messenger.axolotl";
public static final String PEP_DEVICE_LIST = PEP_PREFIX + ".devicelist";
public static final String PEP_DEVICE_LIST_NOTIFY = PEP_DEVICE_LIST + "+notify";
public static final String PEP_BUNDLES = PEP_PREFIX + ".bundles";
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index f0e502204..cb5d860d0 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -83,9 +83,9 @@ import de.pixart.messenger.xmpp.jid.Jid;
public class ConversationActivity extends XmppActivity
implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, View.OnClickListener {
- public static final String ACTION_VIEW_CONVERSATION = "eu.siacs.conversations.action.VIEW";
+ public static final String ACTION_VIEW_CONVERSATION = "de.pixart.messenger.VIEW";
public static final String CONVERSATION = "conversationUuid";
- public static final String EXTRA_DOWNLOAD_UUID = "eu.siacs.conversations.download_uuid";
+ public static final String EXTRA_DOWNLOAD_UUID = "de.pixart.messenger.download_uuid";
public static final String TEXT = "text";
public static final String NICK = "nick";
public static final String PRIVATE_MESSAGE = "pm";
@@ -932,7 +932,7 @@ public class ConversationActivity extends XmppActivity
if (new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION).resolveActivity(getPackageManager()) == null) {
attachFilePopup.getMenu().findItem(R.id.attach_record_voice).setVisible(false);
}
- if (new Intent("eu.siacs.conversations.location.request").resolveActivity(getPackageManager()) == null) {
+ if (new Intent("de.pixart.messenger.location.request").resolveActivity(getPackageManager()) == null) {
attachFilePopup.getMenu().findItem(R.id.attach_location).setVisible(false);
}
attachFilePopup.setOnMenuItemClickListener(new OnMenuItemClickListener() {
diff --git a/src/main/java/de/pixart/messenger/utils/GeoHelper.java b/src/main/java/de/pixart/messenger/utils/GeoHelper.java
index e8204e12d..afcb1bd8e 100644
--- a/src/main/java/de/pixart/messenger/utils/GeoHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/GeoHelper.java
@@ -52,7 +52,7 @@ public class GeoHelper {
label = "";
}
- Intent locationPluginIntent = new Intent("eu.siacs.conversations.location.show");
+ Intent locationPluginIntent = new Intent("de.pixart.messenger.location.show");
locationPluginIntent.putExtra("latitude",latitude);
locationPluginIntent.putExtra("longitude",longitude);
if (message.getStatus() != Message.STATUS_RECEIVED) {
diff --git a/src/playstore/AndroidManifest.xml b/src/playstore/AndroidManifest.xml
index 1b3611eff..780436aaa 100644
--- a/src/playstore/AndroidManifest.xml
+++ b/src/playstore/AndroidManifest.xml
@@ -5,7 +5,7 @@
<permission android:name="de.pixart.messenger.permission.C2D_MESSAGE"
android:protectionLevel="signature"/>
- <uses-permission android:name="eu.siacs.conversations.permission.C2D_MESSAGE"/>
+ <uses-permission android:name="de.pixart.messenger.permission.C2D_MESSAGE"/>
<application>