Additional refactoring/clean-up

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>

app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java

@@ -294,8 +294,7 @@ public class NotificationWorker extends Worker {
 
         intent.setAction(Long.toString(System.currentTimeMillis()));
 
-        PendingIntent pendingIntent = PendingIntent.getActivity(context,
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
-                0, intent, 0);
 
         Uri uri = Uri.parse(signatureVerification.getUserEntity().getBaseUrl());
         String baseUrl = uri.getHost();
@@ -343,44 +342,41 @@ public class NotificationWorker extends Worker {
 
         notificationBuilder.setContentIntent(pendingIntent);
 
-
-        CRC32 crc32 = new CRC32();
-
         String groupName = signatureVerification.getUserEntity().getId() + "@" + decryptedPushMessage.getId();
-        crc32.update(groupName.getBytes());
+        notificationBuilder.setGroup(Long.toString(calculateCRC32(groupName)));
-        notificationBuilder.setGroup(Long.toString(crc32.getValue()));
-
-        // notificationId
-        crc32 = new CRC32();
-        String stringForCrc = String.valueOf(System.currentTimeMillis());
-        crc32.update(stringForCrc.getBytes());
 
         StatusBarNotification activeStatusBarNotification =
                 NotificationUtils.INSTANCE.findNotificationForRoom(context,
                         signatureVerification.getUserEntity(), decryptedPushMessage.getId());
 
-        int notificationId;
+        // NOTE - systemNotificationId is an internal ID used on the device only.
-
+        // It is NOT the same as the notification ID used in communication with the server.
+        int systemNotificationId;
         if (activeStatusBarNotification != null) {
-            notificationId = activeStatusBarNotification.getId();
+            systemNotificationId = activeStatusBarNotification.getId();
         } else {
-            notificationId = (int) crc32.getValue();
+            systemNotificationId = (int) calculateCRC32(String.valueOf(System.currentTimeMillis()));
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N &&
             CHAT.equals(decryptedPushMessage.getType()) &&
             decryptedPushMessage.getNotificationUser() != null) {
-            sendChatNotification(notificationBuilder, activeStatusBarNotification, notificationId);
+            prepareChatNotification(notificationBuilder, activeStatusBarNotification, systemNotificationId);
-        } else {
-            sendNotificationWithId(notificationId, notificationBuilder.build());
         }
 
+        sendNotification(systemNotificationId, notificationBuilder.build());
+    }
+
+    private long calculateCRC32(String s) {
+        CRC32 crc32 = new CRC32();
+        crc32.update(s.getBytes());
+        return crc32.getValue();
     }
 
     @RequiresApi(api = Build.VERSION_CODES.N)
-    private void sendChatNotification(NotificationCompat.Builder notificationBuilder,
+    private void prepareChatNotification(NotificationCompat.Builder notificationBuilder,
-                                      StatusBarNotification activeStatusBarNotification,
+                                         StatusBarNotification activeStatusBarNotification,
-                                      int notificationId) {
+                                         int systemNotificationId) {
 
         final NotificationUser notificationUser = decryptedPushMessage.getNotificationUser();
         final String userType = notificationUser.getType();
@@ -397,7 +393,7 @@ public class NotificationWorker extends Worker {
                     .setBot("bot".equals(userType));
 
         notificationBuilder.setOnlyAlertOnce(true);
-        addReplyAction(notificationBuilder, notificationId);
+        addReplyAction(notificationBuilder, systemNotificationId);
 
         if ("user".equals(userType) || "guest".equals(userType)) {
             String baseUrl = signatureVerification.getUserEntity().getBaseUrl();
@@ -408,10 +404,10 @@ public class NotificationWorker extends Worker {
         }
 
         notificationBuilder.setStyle(getStyle(person.build(), style));
-        sendNotificationWithId(notificationId, notificationBuilder.build());
     }
 
-    private void addReplyAction(NotificationCompat.Builder notificationBuilder, int notificationId) {
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    private void addReplyAction(NotificationCompat.Builder notificationBuilder, int systemNotificationId) {
         String replyLabel = context.getResources().getString(R.string.nc_reply);
 
         RemoteInput remoteInput = new RemoteInput.Builder(NotificationUtils.KEY_DIRECT_REPLY)
@@ -421,13 +417,12 @@ public class NotificationWorker extends Worker {
         // Build a PendingIntent for the reply action
         Intent actualIntent = new Intent(context, DirectReplyReceiver.class);
 
-        // NOTE - This notificationId is an internal ID used on the device only.
+        // NOTE - systemNotificationId is an internal ID used on the device only.
         // It is NOT the same as the notification ID used in communication with the server.
-        actualIntent.putExtra(BundleKeys.INSTANCE.getKEY_NOTIFICATION_ID(), notificationId);
+        actualIntent.putExtra(BundleKeys.INSTANCE.getKEY_SYSTEM_NOTIFICATION_ID(), systemNotificationId);
         actualIntent.putExtra(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), decryptedPushMessage.getId());
         PendingIntent replyPendingIntent =
-            PendingIntent.getBroadcast(getApplicationContext(),
+            PendingIntent.getBroadcast(context, systemNotificationId, actualIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-                                       notificationId, actualIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 
         NotificationCompat.Action replyAction =
             new NotificationCompat.Action.Builder(R.drawable.ic_reply, replyLabel, replyPendingIntent)
@@ -458,7 +453,7 @@ public class NotificationWorker extends Worker {
         return newStyle;
     }
 
-    private void sendNotificationWithId(int notificationId, Notification notification) {
+    private void sendNotification(int notificationId, Notification notification) {
         NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
         notificationManager.notify(notificationId, notification);
 
@@ -469,8 +464,7 @@ public class NotificationWorker extends Worker {
         }
 
         if (!notification.category.equals(Notification.CATEGORY_CALL) || !muteCall) {
-            Uri soundUri = NotificationUtils.INSTANCE.getMessageRingtoneUri(getApplicationContext(),
+            Uri soundUri = NotificationUtils.INSTANCE.getMessageRingtoneUri(context, appPreferences);
-                                                                            appPreferences);
             if (soundUri != null && !ApplicationWideCurrentRoomHolder.getInstance().isInCall() &&
                     (DoNotDisturbUtils.INSTANCE.shouldPlaySound() || importantConversation)) {
                 AudioAttributes.Builder audioAttributesBuilder = new AudioAttributes.Builder().setContentType

app/src/main/java/com/nextcloud/talk/receivers/DirectReplyReceiver.kt

@@ -38,8 +38,8 @@ import com.nextcloud.talk.models.database.UserEntity
 import com.nextcloud.talk.models.json.generic.GenericOverall
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.NotificationUtils
-import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_NOTIFICATION_ID
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
+import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_SYSTEM_NOTIFICATION_ID
 import com.nextcloud.talk.utils.database.user.UserUtils
 import io.reactivex.Observer
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -60,7 +60,7 @@ class DirectReplyReceiver : BroadcastReceiver() {
 
     lateinit var context: Context
     lateinit var currentUser: UserEntity
-    private var notificationId: Int? = null
+    private var systemNotificationId: Int? = null
     private var roomToken: String? = null
     private var replyMessage: CharSequence? = null
 
@@ -72,9 +72,9 @@ class DirectReplyReceiver : BroadcastReceiver() {
         context = receiveContext
         currentUser = userUtils!!.currentUser!!
 
-        // NOTE - This notificationId is an internal ID used on the device only.
+        // NOTE - systemNotificationId is an internal ID used on the device only.
         // It is NOT the same as the notification ID used in communication with the server.
-        notificationId = intent!!.getIntExtra(KEY_NOTIFICATION_ID, 0)
+        systemNotificationId = intent!!.getIntExtra(KEY_SYSTEM_NOTIFICATION_ID, 0)
         roomToken = intent.getStringExtra(KEY_ROOM_TOKEN)
 
         replyMessage = getMessageText(intent)
@@ -130,7 +130,7 @@ class DirectReplyReceiver : BroadcastReceiver() {
         // https://developer.android.com/training/notify-user/build-notification#messaging-best-practices
 
         // Find the original (active) notification
-        val previousNotification = findActiveNotification(notificationId!!) ?: return
+        val previousNotification = findActiveNotification(systemNotificationId!!) ?: return
 
         // Recreate builder based on the active notification
         val previousBuilder = NotificationCompat.Builder(context, previousNotification)
@@ -152,6 +152,6 @@ class DirectReplyReceiver : BroadcastReceiver() {
         previousBuilder.setStyle(previousStyle)
 
         // Update the active notification.
-        NotificationManagerCompat.from(context).notify(notificationId!!, previousBuilder.build())
+        NotificationManagerCompat.from(context).notify(systemNotificationId!!, previousBuilder.build())
     }
 }

app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt

@@ -71,4 +71,5 @@ object BundleKeys {
     val KEY_FORWARD_MSG_FLAG = "KEY_FORWARD_MSG_FLAG"
     val KEY_FORWARD_MSG_TEXT = "KEY_FORWARD_MSG_TEXT"
     val KEY_FORWARD_HIDE_SOURCE_ROOM = "KEY_FORWARD_HIDE_SOURCE_ROOM"
+    val KEY_SYSTEM_NOTIFICATION_ID = "KEY_SYSTEM_NOTIFICATION_ID"
 }