aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-02-04 19:21:21 +0100
committerChristian Schneppe <christian@pix-art.de>2019-02-04 19:21:21 +0100
commitdd8d63be4c584e6aadb6f56aa920cb1bec16e4ea (patch)
treefa7f8b2a5cc2a0ef6983e73854f1bb21a17abe10
parent303bc8519361f42d013f46b172dea44d06753413 (diff)
rename some variables
-rw-r--r--src/main/java/de/pixart/messenger/entities/Message.java2
-rw-r--r--src/main/java/de/pixart/messenger/ui/StartConversationActivity.java2
-rw-r--r--src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java2
-rw-r--r--src/standardPush/AndroidManifest.xml2
-rw-r--r--src/standardPush/java/de/pixart/messenger/services/MaintenanceReceiver.java2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index b32c440a5..ba44a10ae 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -77,7 +77,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
public static final String MARKABLE = "markable";
public static final String FILE_DELETED = "file_deleted";
public static final String ME_COMMAND = "/me";
- public static final String ERROR_MESSAGE_CANCELLED = "eu.siacs.conversations.cancelled";
+ public static final String ERROR_MESSAGE_CANCELLED = "de.pixart.messenger.cancelled";
public boolean markable = false;
protected String conversationUuid;
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 2621d2322..13a7c9e80 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -85,7 +85,7 @@ import static de.pixart.messenger.ui.SettingsActivity.USE_BUNDLED_EMOJIS;
public class StartConversationActivity extends XmppActivity implements XmppConnectionService.OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, CreateConferenceDialog.CreateConferenceDialogListener, JoinConferenceDialog.JoinConferenceDialogListener {
- public static final String EXTRA_INVITE_URI = "eu.siacs.conversations.invite_uri";
+ public static final String EXTRA_INVITE_URI = "de.pixart.messenger.invite_uri";
private final int REQUEST_SYNC_CONTACTS = 0x28cf;
private final int REQUEST_CREATE_CONFERENCE = 0x39da;
diff --git a/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java b/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java
index f5a5fb14f..7d56cda8d 100644
--- a/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java
@@ -102,7 +102,7 @@ public class UriHandlerActivity extends AppCompatActivity {
if (jid != null) {
Class clazz;
try {
- clazz = Class.forName("eu.siacs.conversations.ui.ShareViaAccountActivity");
+ clazz = Class.forName("de.pixart.messenger.ui.ShareViaAccountActivity");
} catch (ClassNotFoundException e) {
clazz = null;
}
diff --git a/src/standardPush/AndroidManifest.xml b/src/standardPush/AndroidManifest.xml
index cf94c879b..a54f8bee1 100644
--- a/src/standardPush/AndroidManifest.xml
+++ b/src/standardPush/AndroidManifest.xml
@@ -17,7 +17,7 @@
android:exported="true"
android:permission="android.permission.CHANGE_CONFIGURATION">
<intent-filter>
- <action android:name="eu.siacs.conversations.RENEW_INSTANCE_ID" />
+ <action android:name="de.pixart.messenger.RENEW_INSTANCE_ID" />
</intent-filter>
</receiver>
diff --git a/src/standardPush/java/de/pixart/messenger/services/MaintenanceReceiver.java b/src/standardPush/java/de/pixart/messenger/services/MaintenanceReceiver.java
index 34627ae64..ccabd7b1e 100644
--- a/src/standardPush/java/de/pixart/messenger/services/MaintenanceReceiver.java
+++ b/src/standardPush/java/de/pixart/messenger/services/MaintenanceReceiver.java
@@ -17,7 +17,7 @@ public class MaintenanceReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
Log.d(Config.LOGTAG, "received intent in maintenance receiver");
- if ("eu.siacs.conversations.RENEW_INSTANCE_ID".equals(intent.getAction())) {
+ if ("de.pixart.messenger.RENEW_INSTANCE_ID".equals(intent.getAction())) {
renewInstanceToken(context);
}