diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-11-15 20:44:00 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-11-15 20:50:54 +0100 |
commit | ba3e6ffba2d27470c448be3c3e28c06b8932b8ee (patch) | |
tree | 623156f1dffea277483362499ec6cf3509445a39 /src/main/java/de/pixart/messenger/services | |
parent | b81313d1db8261ba76ecbe0c2bc16ac26edac311 (diff) |
refactored some ManageAccount, WelcomeActivity and a few other things
Diffstat (limited to 'src/main/java/de/pixart/messenger/services')
-rw-r--r-- | src/main/java/de/pixart/messenger/services/NotificationService.java | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 12 |
2 files changed, 10 insertions, 16 deletions
diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java index c186732bf..99ba3ddfe 100644 --- a/src/main/java/de/pixart/messenger/services/NotificationService.java +++ b/src/main/java/de/pixart/messenger/services/NotificationService.java @@ -54,8 +54,10 @@ import de.pixart.messenger.entities.Conversational; import de.pixart.messenger.entities.Message; import de.pixart.messenger.persistance.FileBackend; import de.pixart.messenger.ui.ConversationsActivity; +import de.pixart.messenger.ui.EditAccountActivity; import de.pixart.messenger.ui.ManageAccountActivity; import de.pixart.messenger.ui.TimePreference; +import de.pixart.messenger.utils.AccountUtils; import de.pixart.messenger.utils.Compatibility; import de.pixart.messenger.utils.GeoHelper; import de.pixart.messenger.utils.UIHelper; @@ -961,10 +963,14 @@ public class NotificationService { mBuilder.setLocalOnly(true); } mBuilder.setPriority(Notification.PRIORITY_LOW); - mBuilder.setContentIntent(PendingIntent.getActivity(mXmppConnectionService, - 145, - new Intent(mXmppConnectionService, ManageAccountActivity.class), - PendingIntent.FLAG_UPDATE_CURRENT)); + final Intent intent; + if (AccountUtils.MANAGE_ACCOUNT_ACTIVITY != null) { + intent = new Intent(mXmppConnectionService, AccountUtils.MANAGE_ACCOUNT_ACTIVITY); + } else { + intent = new Intent(mXmppConnectionService, EditAccountActivity.class); + intent.putExtra("jid", errors.get(0).getJid().asBareJid().toEscapedString()); + } + mBuilder.setContentIntent(PendingIntent.getActivity(mXmppConnectionService, 145, intent, PendingIntent.FLAG_UPDATE_CURRENT)); if (Compatibility.runsTwentySix()) { mBuilder.setChannelId(ERROR_CHANNEL_ID); } diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index 54e86a6ab..bb704c6b6 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -4285,18 +4285,6 @@ public class XmppConnectionService extends Service { return mPushManagementService; } - public Account getPendingAccount() { - Account pending = null; - for (Account account : getAccounts()) { - if (!account.isOptionSet(Account.OPTION_LOGGED_IN_SUCCESSFULLY)) { - pending = account; - } else { - return null; - } - } - return pending; - } - public void changeStatus(Account account, PresenceTemplate template, String signature) { if (!template.getStatusMessage().isEmpty()) { databaseBackend.insertPresenceTemplate(template); |