Work on #237

Signed-off-by: Mario Danic <mario@lovelyhq.com>

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

@@ -42,10 +42,15 @@ import com.evernote.android.job.util.support.PersistableBundleCompat;
 import com.nextcloud.talk.R;
 import com.nextcloud.talk.activities.MagicCallActivity;
 import com.nextcloud.talk.activities.MainActivity;
+import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.models.RingtoneSettings;
 import com.nextcloud.talk.models.SignatureVerification;
+import com.nextcloud.talk.models.database.UserEntity;
 import com.nextcloud.talk.models.json.push.DecryptedPushMessage;
+import com.nextcloud.talk.models.json.rooms.Room;
+import com.nextcloud.talk.models.json.rooms.RoomOverall;
+import com.nextcloud.talk.utils.ApiUtils;
 import com.nextcloud.talk.utils.NotificationUtils;
 import com.nextcloud.talk.utils.PushUtils;
 import com.nextcloud.talk.utils.bundle.BundleKeys;
@@ -68,6 +73,9 @@ import javax.crypto.NoSuchPaddingException;
 import javax.inject.Inject;
 
 import autodagger.AutoInjector;
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 @AutoInjector(NextcloudTalkApplication.class)
 public class NotificationJob extends Job {
@@ -79,13 +87,19 @@ public class NotificationJob extends Job {
     @Inject
     AppPreferences appPreferences;
 
+    @Inject
+    NcApi ncApi;
+
+    private DecryptedPushMessage decryptedPushMessage;
+    private Context context;
+    private SignatureVerification signatureVerification;
 
     @NonNull
     @Override
     protected Result onRunJob(Params params) {
         NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this);
 
-        Context context = getContext();
+        context = getContext();
         PersistableBundleCompat persistableBundleCompat = getParams().getExtras();
         String subject = persistableBundleCompat.getString(BundleKeys.KEY_NOTIFICATION_SUBJECT, "");
         String signature = persistableBundleCompat.getString(BundleKeys.KEY_NOTIFICATION_SIGNATURE, "");
@@ -99,14 +113,14 @@ public class NotificationJob extends Job {
                 PrivateKey privateKey = (PrivateKey) pushUtils.readKeyFromFile(false);
 
                 try {
-                    SignatureVerification signatureVerification = pushUtils.verifySignature(base64DecodedSignature,
+                    signatureVerification = pushUtils.verifySignature(base64DecodedSignature,
                             base64DecodedSubject);
 
                     if (signatureVerification.isSignatureValid()) {
                         Cipher cipher = Cipher.getInstance("RSA/None/PKCS1Padding");
                         cipher.init(Cipher.DECRYPT_MODE, privateKey);
                         byte[] decryptedSubject = cipher.doFinal(base64DecodedSubject);
-                        DecryptedPushMessage decryptedPushMessage = LoganSquare.parse(new String(decryptedSubject),
+                        decryptedPushMessage = LoganSquare.parse(new String(decryptedSubject),
                                 DecryptedPushMessage.class);
 
                         boolean hasChatSupport = signatureVerification.getUserEntity().hasSpreedCapabilityWithName
@@ -124,13 +138,7 @@ public class NotificationJob extends Job {
                                         decryptedPushMessage.getType().equals("call"));
 
                         if (shouldShowNotification) {
-                            int smallIcon = 0;
-                            Bitmap largeIcon;
-                            String category = "";
-                            int priority = Notification.PRIORITY_HIGH;
                             Intent intent;
-                            Uri soundUri = null;
-
                             Bundle bundle = new Bundle();
 
 
@@ -142,7 +150,15 @@ public class NotificationJob extends Job {
                             }
 
                             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+
+                            if (!signatureVerification.getUserEntity().hasSpreedCapabilityWithName
+                                    ("no-ping")) {
                                 bundle.putString(BundleKeys.KEY_ROOM_ID, decryptedPushMessage.getId());
+                            } else {
+                                bundle.putString(BundleKeys.KEY_ROOM_TOKEN, decryptedPushMessage.getId());
+                            }
+
                             bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, Parcels.wrap(signatureVerification
                                     .getUserEntity()));
 
@@ -151,43 +167,96 @@ public class NotificationJob extends Job {
 
                             intent.putExtras(bundle);
 
+                            switch (decryptedPushMessage.getType()) {
+                                case "call":
+                                    if (!bundle.containsKey(BundleKeys.KEY_ROOM_TOKEN)) {
+                                        context.startActivity(intent);
+                                    } else {
+                                        showNotificationForCallWithNoPing(intent);
+                                    }
+                                    break;
+                                case "room":
+                                    // do absolutely nothing, we won't even come to this point
+                                    break;
+                                case "chat":
+                                    showNotification(intent);
+                                    break;
+                                default:
+                                    break;
+                            }
+
+                        }
+                    }
+                } catch (NoSuchAlgorithmException e1) {
+                    Log.d(TAG, "No proper algorithm to decrypt the message " + e1.getLocalizedMessage());
+                } catch (NoSuchPaddingException e1) {
+                    Log.d(TAG, "No proper padding to decrypt the message " + e1.getLocalizedMessage());
+                } catch (InvalidKeyException e1) {
+                    Log.d(TAG, "Invalid private key " + e1.getLocalizedMessage());
+                }
+            } catch (Exception exception) {
+                Log.d(TAG, "Something went very wrong" + exception.getLocalizedMessage());
+            }
+        }
+        return Result.SUCCESS;
+    }
+
+    private void showNotificationForCallWithNoPing(Intent intent) {
+        UserEntity userEntity = signatureVerification.getUserEntity();
+        ncApi.getRoom(ApiUtils.getCredentials(userEntity.getUserId(),
+                userEntity.getToken()), ApiUtils.getRoom(userEntity.getBaseUrl(),
+                intent.getExtras().getString(BundleKeys.KEY_ROOM_TOKEN)))
+                .subscribeOn(Schedulers.newThread())
+                .subscribe(new Observer<RoomOverall>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(RoomOverall roomOverall) {
+                        Room room = roomOverall.getOcs().getData();
+
+                        if (room.getType().equals(Room.RoomType.ROOM_TYPE_ONE_TO_ONE_CALL)) {
+                            context.startActivity(intent);
+                        } else {
+                            showNotification(intent);
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+    private void showNotification(Intent intent) {
+        int smallIcon;
+        Bitmap largeIcon;
+        String category;
+        int priority = Notification.PRIORITY_HIGH;
+        Uri soundUri;
+
+        if (decryptedPushMessage.getType().equals("chat")) {
+            smallIcon = R.drawable.ic_chat_white_24dp;
+            category = Notification.CATEGORY_MESSAGE;
+        } else {
+            smallIcon = R.drawable.ic_call_white_24dp;
+            category = Notification.CATEGORY_CALL;
+        }
+
         PendingIntent pendingIntent = PendingIntent.getActivity(context,
                 0, intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
 
         NotificationManager notificationManager =
                 (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
-                            String ringtonePreferencesString;
-                            switch (decryptedPushMessage.getType()) {
-                                case "call":
-                                    context.startActivity(intent);
-                                    break;
-                                case "room":
-                                    // do absolutely nothing, we won't even come to this point
-                                    break;
-                                case "chat":
-                                    ringtonePreferencesString = appPreferences.getMessageRingtoneUri();
-                                    if (TextUtils.isEmpty(ringtonePreferencesString)) {
-                                        soundUri = Uri.parse("android.resource://" + context.getPackageName() +
-                                                "/raw/librem_by_feandesign_message");
-                                    } else {
-                                        try {
-                                            RingtoneSettings ringtoneSettings = LoganSquare.parse
-                                                    (ringtonePreferencesString, RingtoneSettings.class);
-                                            soundUri = ringtoneSettings.getRingtoneUri();
-                                        } catch (IOException exception) {
-                                            soundUri = Uri.parse("android.resource://" + context.getPackageName() +
-                                                    "/raw/librem_by_feandesign_message");
-                                        }
-                                    }
-                                    smallIcon = R.drawable.ic_chat_white_24dp;
-                                    category = Notification.CATEGORY_MESSAGE;
-                                    break;
-                                default:
-                                    smallIcon = R.drawable.ic_logo;
-                            }
-
-                            if (decryptedPushMessage.getType().equals("chat")) {
         largeIcon = BitmapFactory.decodeResource(context.getResources(), smallIcon);
         CRC32 crc32 = new CRC32();
 
@@ -220,13 +289,24 @@ public class NotificationJob extends Job {
                     Long.toString(crc32.getValue()),
                     groupName);
 
+            if (decryptedPushMessage.getType().equals("chat")) {
                 NotificationUtils.createNotificationChannel(notificationManager,
-                                            NotificationUtils.NOTIFICATION_CHANNEL_MESSAGES_V2, context.getResources()
+                        NotificationUtils.NOTIFICATION_CHANNEL_MESSAGES_V3, context.getResources()
                                 .getString(R.string.nc_notification_channel_messages), context.getResources()
-                                                    .getString(R.string.nc_notification_channel_messages_description), true,
+                                .getString(R.string.nc_notification_channel_messages), true,
                         NotificationManager.IMPORTANCE_HIGH);
 
                 notificationBuilder.setChannelId(NotificationUtils.NOTIFICATION_CHANNEL_MESSAGES_V2);
+            } else {
+                NotificationUtils.createNotificationChannel(notificationManager,
+                        NotificationUtils.NOTIFICATION_CHANNEL_CALLS_V2, context.getResources()
+                                .getString(R.string.nc_notification_channel_calls), context.getResources()
+                                .getString(R.string.nc_notification_channel_calls_description), true,
+                        NotificationManager.IMPORTANCE_HIGH);
+
+                notificationBuilder.setChannelId(NotificationUtils.NOTIFICATION_CHANNEL_CALLS_V2);
+            }
+
             notificationBuilder.setGroup(Long.toString(crc32.getValue()));
         }
 
@@ -239,6 +319,23 @@ public class NotificationJob extends Job {
         crc32 = new CRC32();
         crc32.update(stringForCrc.getBytes());
 
+        String ringtonePreferencesString;
+        ringtonePreferencesString = appPreferences.getMessageRingtoneUri();
+        if (TextUtils.isEmpty(ringtonePreferencesString)) {
+            soundUri = Uri.parse("android.resource://" + context.getPackageName() +
+                    "/raw/librem_by_feandesign_message");
+        } else {
+            try {
+                RingtoneSettings ringtoneSettings = LoganSquare.parse
+                        (ringtonePreferencesString, RingtoneSettings.class);
+                soundUri = ringtoneSettings.getRingtoneUri();
+            } catch (IOException exception) {
+                soundUri = Uri.parse("android.resource://" + context.getPackageName() +
+                        "/raw/librem_by_feandesign_message");
+            }
+        }
+
+
         if (notificationManager != null) {
             notificationManager.notify((int) crc32.getValue(), notificationBuilder.build());
 
@@ -250,19 +347,5 @@ public class NotificationJob extends Job {
             }
         }
     }
-                        }
+
-                    }
-                } catch (NoSuchAlgorithmException e1) {
-                    Log.d(TAG, "No proper algorithm to decrypt the message " + e1.getLocalizedMessage());
-                } catch (NoSuchPaddingException e1) {
-                    Log.d(TAG, "No proper padding to decrypt the message " + e1.getLocalizedMessage());
-                } catch (InvalidKeyException e1) {
-                    Log.d(TAG, "Invalid private key " + e1.getLocalizedMessage());
-                }
-            } catch (Exception exception) {
-                Log.d(TAG, "Something went very wrong" + exception.getLocalizedMessage());
-            }
-        }
-        return Result.SUCCESS;
-    }
 }

app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.java

@@ -32,11 +32,12 @@ public class NotificationUtils {
     public static final String NOTIFICATION_CHANNEL_MESSAGES = "NOTIFICATION_CHANNEL_MESSAGES";
     public static final String NOTIFICATION_CHANNEL_CALLS_V2 = "NOTIFICATION_CHANNEL_CALLS_V2";
     public static final String NOTIFICATION_CHANNEL_MESSAGES_V2 = "NOTIFICATION_CHANNEL_MESSAGES_V2";
+    public static final String NOTIFICATION_CHANNEL_MESSAGES_V3 = "NOTIFICATION_CHANNEL_MESSAGES_V2";
 
     @TargetApi(Build.VERSION_CODES.O)
     public static void createNotificationChannel(NotificationManager notificationManager,
                                                  String channelId, String channelName,
-                                                 String channelDescription, boolean vibrate,
+                                                 String channelDescription, boolean enableLights,
                                                  int importance) {
 
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O
@@ -46,10 +47,9 @@ public class NotificationUtils {
                     importance);
 
             channel.setDescription(channelDescription);
-            channel.enableLights(vibrate);
+            channel.enableLights(enableLights);
-            channel.enableVibration(vibrate);
-
             channel.setLightColor(Color.RED);
+
             notificationManager.createNotificationChannel(channel);
         }
     }

app/src/main/res/values/strings.xml

@@ -61,9 +61,9 @@
     <string name="nc_settings_account_updated">Your already existing account was updated, instead of adding a new one</string>
     <string name="nc_account_scheduled_for_deletion">The account is scheduled for deletion, and cannot be changed</string>
     <string name="nc_settings_notification_sounds">Notification sounds</string>
-    <string name="nc_settings_call_ringtone">Calls</string>
+    <string name="nc_settings_call_ringtone">One-on-One Calls</string>
     <string name="nc_settings_call_ringtone_key" translatable="false">call_ringtone</string>
-    <string name="nc_settings_message_ringtone">Messages</string>
+    <string name="nc_settings_message_ringtone">Other</string>
     <string name="nc_settings_message_ringtone_key" translatable="false">message_ringtone</string>
     <string name="nc_settings_default_ringtone" translatable="false">Librem by feandesign</string>
     <string name="nc_settings_no_ringtone">No sound</string>