From 8d409cd4d6d7351251dd73e4f7246e69995639b7 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Wed, 20 Jun 2018 19:39:53 +0200 Subject: [PATCH] Fix a typo Signed-off-by: Mario Danic --- .../java/com/nextcloud/talk/jobs/NotificationJob.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java index 6bbfc77c9..4fb991f43 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java @@ -46,12 +46,12 @@ import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.models.RingtoneSettings; import com.nextcloud.talk.models.SignatureVerification; import com.nextcloud.talk.models.json.push.DecryptedPushMessage; -import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder; import com.nextcloud.talk.utils.NotificationUtils; import com.nextcloud.talk.utils.PushUtils; import com.nextcloud.talk.utils.bundle.BundleKeys; import com.nextcloud.talk.utils.database.user.UserUtils; import com.nextcloud.talk.utils.preferences.AppPreferences; +import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder; import com.nextcloud.talk.utils.singletons.ApplicationWideStateHolder; import org.parceler.Parcels; @@ -79,6 +79,7 @@ public class NotificationJob extends Job { @Inject AppPreferences appPreferences; + @NonNull @Override protected Result onRunJob(Params params) { @@ -159,8 +160,8 @@ public class NotificationJob extends Job { String ringtonePreferencesString; switch (decryptedPushMessage.getType()) { case "call": - getContext().startActivity(intent); - break; + context.startActivity(intent); + return Result.SUCCESS; case "room": // do absolutely nothing, we won't even come to this point break; @@ -220,12 +221,12 @@ public class NotificationJob extends Job { groupName); NotificationUtils.createNotificationChannel(notificationManager, - NotificationUtils.NOTIFICATION_CHANNEL_CALLS_V2, context.getResources() + NotificationUtils.NOTIFICATION_CHANNEL_MESSAGES_V2, context.getResources() .getString(R.string.nc_notification_channel_messages), context.getResources() .getString(R.string.nc_notification_channel_messages_description), true, NotificationManager.IMPORTANCE_HIGH); - notificationBuilder.setChannelId(NotificationUtils.NOTIFICATION_CHANNEL_CALLS_V2); + notificationBuilder.setChannelId(NotificationUtils.NOTIFICATION_CHANNEL_MESSAGES_V2); notificationBuilder.setGroup(Long.toString(crc32.getValue())); }