From 8a53a1bd5f9c2642a31d43b5d318a241f57b262c Mon Sep 17 00:00:00 2001
From: 0x330a <92654767+0x330a@users.noreply.github.com>
Date: Tue, 8 Aug 2023 16:35:00 +1000
Subject: [PATCH] fix: PR comments

---
 .../securesms/MediaOverviewActivity.java      | 25 ++++++++-----------
 .../v2/messages/VoiceMessageView.kt           |  6 +++--
 .../PrivacySettingsPreferenceFragment.kt      |  5 ++--
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
index c0ad2a53b..fc51a10a5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
@@ -434,20 +434,17 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
 
       @Override
       public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
-        int itemId = menuItem.getItemId();
-        if (itemId == R.id.save) {
-          handleSaveMedia(getListAdapter().getSelectedMedia());
-          return true;
-        } else if (itemId == R.id.save) {
-          handleSaveMedia(getListAdapter().getSelectedMedia());
-          return true;
-        } else if (itemId == R.id.delete) {
-          handleDeleteMedia(getListAdapter().getSelectedMedia());
-          actionMode.finish();
-          return true;
-        } else if (itemId == R.id.select_all) {
-          handleSelectAllMedia();
-          return true;
+        switch (menuItem.getItemId()) {
+          case R.id.save:
+            handleSaveMedia(getListAdapter().getSelectedMedia());
+            return true;
+          case R.id.delete:
+            handleDeleteMedia(getListAdapter().getSelectedMedia());
+            actionMode.finish();
+            return true;
+          case R.id.select_all:
+            handleSelectAllMedia();
+            return true;
         }
         return false;
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt
index 631a9c07d..9cef3229a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt
@@ -6,6 +6,8 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.RelativeLayout
 import androidx.core.view.isVisible
+import com.google.android.exoplayer2.ui.R.drawable.exo_icon_pause
+import com.google.android.exoplayer2.ui.R.drawable.exo_icon_play
 import dagger.hilt.android.AndroidEntryPoint
 import network.loki.messenger.databinding.ViewVoiceMessageBinding
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
@@ -118,8 +120,8 @@ class VoiceMessageView : RelativeLayout, AudioSlidePlayer.Listener {
 
     private fun renderIcon() {
         val iconID =
-            if (isPlaying) com.google.android.exoplayer2.ui.R.drawable.exo_icon_pause
-            else com.google.android.exoplayer2.ui.R.drawable.exo_icon_play
+            if (isPlaying) exo_icon_pause
+            else exo_icon_play
         binding.voiceMessagePlaybackImageView.setImageResource(iconID)
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt
index e030d970c..e4023fffc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt
@@ -50,9 +50,8 @@ class PrivacySettingsPreferenceFragment : ListSummaryPreferenceFragment() {
                             .setData(Uri.parse("package:" + BuildConfig.APPLICATION_ID))
                     }
                         .apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) }
-                        .takeIf { IntentUtils.isResolvable(requireContext(), it) }?.let {
-                        startActivity(it)
-                    }
+                        .takeIf { IntentUtils.isResolvable(requireContext(), it) }
+                        ?.let(::startActivity)
                 }
                 button(R.string.dismiss)
             }