oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

fix: PR comments

This commit is contained in:
0x330a 2023-08-08 16:35:00 +10:00
parent f73ed2942c
commit 8a53a1bd5f
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
View File

@ -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;
}

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt
View File

@ -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)
}

5
app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt
View File

@ -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)
}