Change mute call behaviour

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

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

@@ -38,6 +38,7 @@ import android.service.notification.StatusBarNotification;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
@@ -47,7 +48,7 @@ import androidx.core.graphics.drawable.IconCompat;
 import androidx.work.Data;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
-import autodagger.AutoInjector;
+
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.facebook.common.executors.UiThreadImmediateExecutorService;
 import com.facebook.common.references.CloseableReference;
@@ -68,26 +69,23 @@ import com.nextcloud.talk.models.SignatureVerification;
 import com.nextcloud.talk.models.database.ArbitraryStorageEntity;
 import com.nextcloud.talk.models.database.UserEntity;
 import com.nextcloud.talk.models.json.chat.ChatUtils;
+import com.nextcloud.talk.models.json.conversations.Conversation;
+import com.nextcloud.talk.models.json.conversations.RoomOverall;
 import com.nextcloud.talk.models.json.notifications.NotificationOverall;
 import com.nextcloud.talk.models.json.push.DecryptedPushMessage;
 import com.nextcloud.talk.models.json.push.NotificationUser;
-import com.nextcloud.talk.models.json.conversations.Conversation;
+import com.nextcloud.talk.utils.ApiUtils;
-import com.nextcloud.talk.models.json.conversations.RoomOverall;
+import com.nextcloud.talk.utils.DisplayUtils;
-import com.nextcloud.talk.utils.*;
+import com.nextcloud.talk.utils.DoNotDisturbUtils;
+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.arbitrarystorage.ArbitraryStorageUtils;
 import com.nextcloud.talk.utils.preferences.AppPreferences;
 import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
-import okhttp3.JavaNetCookieJar;
-import okhttp3.OkHttpClient;
-import org.parceler.Parcels;
-import retrofit2.Retrofit;
 
-import javax.crypto.Cipher;
+import org.parceler.Parcels;
-import javax.crypto.NoSuchPaddingException;
+
-import javax.inject.Inject;
 import java.io.IOException;
 import java.net.CookieManager;
 import java.security.InvalidKeyException;
@@ -96,6 +94,17 @@ import java.security.PrivateKey;
 import java.util.HashMap;
 import java.util.zip.CRC32;
 
+import javax.crypto.Cipher;
+import javax.crypto.NoSuchPaddingException;
+import javax.inject.Inject;
+
+import autodagger.AutoInjector;
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
+import okhttp3.JavaNetCookieJar;
+import okhttp3.OkHttpClient;
+import retrofit2.Retrofit;
+
 @AutoInjector(NextcloudTalkApplication.class)
 public class NotificationWorker extends Worker {
     public static final String TAG = "NotificationWorker";
@@ -120,6 +129,7 @@ public class NotificationWorker extends Worker {
     private String conversationType = "one2one";
 
     private String credentials;
+    private boolean muteCall = false;
 
     public NotificationWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
         super(context, workerParams);
@@ -129,14 +139,12 @@ public class NotificationWorker extends Worker {
         UserEntity userEntity = signatureVerification.getUserEntity();
 
         ArbitraryStorageEntity arbitraryStorageEntity;
-        boolean muteCalls = false;
 
         if ((arbitraryStorageEntity = arbitraryStorageUtils.getStorageSetting(userEntity.getId(),
                 "mute_calls", intent.getExtras().getString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN()))) != null) {
-            muteCalls = Boolean.parseBoolean(arbitraryStorageEntity.getValue());
+            muteCall = Boolean.parseBoolean(arbitraryStorageEntity.getValue());
         }
 
-        if (!muteCalls) {
         ncApi.getRoom(credentials, ApiUtils.getRoom(userEntity.getBaseUrl(),
                 intent.getExtras().getString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN())))
                 .blockingSubscribe(new Observer<RoomOverall>() {
@@ -178,7 +186,6 @@ public class NotificationWorker extends Worker {
                     }
                 });
     }
-    }
 
     private void showNotificationWithObjectData(Intent intent) {
         UserEntity userEntity = signatureVerification.getUserEntity();
@@ -443,6 +450,7 @@ public class NotificationWorker extends Worker {
         NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
         notificationManager.notify(notificationId, notification);
 
+        if (!muteCall) {
             String ringtonePreferencesString;
             Uri soundUri;
 
@@ -499,6 +507,7 @@ public class NotificationWorker extends Worker {
                 }
             }
         }
+    }
 
     @NonNull
     @Override

app/src/main/res/layout/notification_settings_item.xml

@@ -48,7 +48,8 @@
             android:layout_height="wrap_content"
             apc:mp_default_value="false"
             apc:mp_key="mute_calls"
-            apc:mp_title="@string/nc_mute_calls" />
+            apc:mp_title="@string/nc_mute_calls"
+            apc:mp_summary="@string/nc_mute_calls_desc"/>
 
     </com.yarolegovich.mp.MaterialPreferenceCategory>
 

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

@@ -200,6 +200,7 @@
     <string name="nc_notify_me_mention">Notify when mentioned</string>
     <string name="nc_notify_me_never">Never notify</string>
     <string name="nc_mute_calls">Mute calls</string>
+    <string name="nc_mute_calls_desc">Incoming calls will be silenced</string>
 
     <!-- Bottom sheet menu -->
     <string name="nc_failed_to_perform_operation">Sorry, something went wrong!</string>