yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 01:39:18 +02:00
Code Issues Releases Wiki Activity

fix warning about non-final resource IDs

Browse source
This commit is contained in:
adbenitez 2025-02-25 17:46:09 +01:00
parent 415785b59d
commit 3dc216ca7f
28 changed files with 474 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gradle.properties
View file

@ -1,6 +1,5 @@
android.defaults.buildfeatures.buildconfig=true android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false android.nonTransitiveRClass=false
android.useAndroidX=true android.useAndroidX=true
org.gradle.jvmargs=-Xmx4608m org.gradle.jvmargs=-Xmx4608m

30
src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java
View file

@ -410,14 +410,28 @@ public abstract class BaseConversationListFragment extends Fragment implements A
@Override @Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) { public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
switch (item.getItemId()) { int itemId = item.getItemId();
case R.id.menu_select_all: handleSelectAllThreads(); return true; if (itemId == R.id.menu_select_all) {
case R.id.menu_delete_selected: handleDeleteAllSelected(); return true; handleSelectAllThreads();
case R.id.menu_pin_selected: handlePinAllSelected(); return true; return true;
case R.id.menu_archive_selected: handleArchiveAllSelected(); return true; } else if (itemId == R.id.menu_delete_selected) {
case R.id.menu_mute_selected: handleMuteAllSelected(); return true; handleDeleteAllSelected();
case R.id.menu_marknoticed_selected: handleMarknoticedSelected(); return true; return true;
case R.id.menu_add_to_home_screen: handleAddToHomeScreen(); return true; } else if (itemId == R.id.menu_pin_selected) {
handlePinAllSelected();
return true;
} else if (itemId == R.id.menu_archive_selected) {
handleArchiveAllSelected();
return true;
} else if (itemId == R.id.menu_mute_selected) {
handleMuteAllSelected();
return true;
} else if (itemId == R.id.menu_marknoticed_selected) {
handleMarknoticedSelected();
return true;
} else if (itemId == R.id.menu_add_to_home_screen) {
handleAddToHomeScreen();
return true;
} }
return false; return false;

9
src/main/java/org/thoughtcrime/securesms/ContactMultiSelectionActivity.java
View file

@ -57,11 +57,10 @@ public class ContactMultiSelectionActivity extends ContactSelectionActivity {
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { if (item.getItemId() == R.id.menu_add_members) {
case R.id.menu_add_members: saveSelection();
saveSelection(); finish();
finish(); return true;
return true;
} }
return false; return false;

20
src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
View file

@ -149,16 +149,16 @@ public class ContactSelectionListFragment extends Fragment
@Override @Override
public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) { public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
switch (menuItem.getItemId()) { int itemId = menuItem.getItemId();
case R.id.menu_select_all: if (itemId == R.id.menu_select_all) {
handleSelectAll(); handleSelectAll();
return true; return true;
case R.id.menu_view_profile: } else if (itemId == R.id.menu_view_profile) {
handleViewProfile(); handleViewProfile();
return true; return true;
case R.id.menu_delete_selected: } else if (itemId == R.id.menu_delete_selected) {
handleDeleteSelected(); handleDeleteSelected();
return true; return true;
} }
return false; return false;
} }

46
src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -503,18 +503,40 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case R.id.menu_add_attachment: handleAddAttachment(); return true; if (itemId == R.id.menu_add_attachment) {
case R.id.menu_leave: handleLeaveGroup(); return true; handleAddAttachment();
case R.id.menu_archive_chat: handleArchiveChat(); return true; return true;
case R.id.menu_clear_chat: fragment.handleClearChat(); return true; } else if (itemId == R.id.menu_leave) {
case R.id.menu_delete_chat: handleDeleteChat(); return true; handleLeaveGroup();
case R.id.menu_mute_notifications: handleMuteNotifications(); return true; return true;
case R.id.menu_show_map: WebxdcActivity.openMaps(this, chatId); return true; } else if (itemId == R.id.menu_archive_chat) {
case R.id.menu_search_up: handleMenuSearchNext(false); return true; handleArchiveChat();
case R.id.menu_search_down: handleMenuSearchNext(true); return true; return true;
case android.R.id.home: handleReturnToConversationList(); return true; } else if (itemId == R.id.menu_clear_chat) {
case R.id.menu_ephemeral_messages: handleEphemeralMessages(); return true; fragment.handleClearChat();
return true;
} else if (itemId == R.id.menu_delete_chat) {
handleDeleteChat();
return true;
} else if (itemId == R.id.menu_mute_notifications) {
handleMuteNotifications();
return true;
} else if (itemId == R.id.menu_show_map) {
WebxdcActivity.openMaps(this, chatId);
return true;
} else if (itemId == R.id.menu_search_up) {
handleMenuSearchNext(false);
return true;
} else if (itemId == R.id.menu_search_down) {
handleMenuSearchNext(true);
return true;
} else if (itemId == android.R.id.home) {
handleReturnToConversationList();
return true;
} else if (itemId == R.id.menu_ephemeral_messages) {
handleEphemeralMessages();
return true;
} }
return false; return false;

74
src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
View file

@ -928,43 +928,43 @@ public class ConversationFragment extends MessageSelectorFragment
@Override @Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) { public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
hideAddReactionView(); hideAddReactionView();
switch(item.getItemId()) { int itemId = item.getItemId();
case R.id.menu_context_copy: if (itemId == R.id.menu_context_copy) {
handleCopyMessage(getListAdapter().getSelectedItems()); handleCopyMessage(getListAdapter().getSelectedItems());
actionMode.finish(); actionMode.finish();
return true; return true;
case R.id.menu_context_delete_message: } else if (itemId == R.id.menu_context_delete_message) {
handleDeleteMessages((int) chatId, getListAdapter().getSelectedItems()); handleDeleteMessages((int) chatId, getListAdapter().getSelectedItems());
return true; return true;
case R.id.menu_context_share: } else if (itemId == R.id.menu_context_share) {
DcHelper.openForViewOrShare(getContext(), getSelectedMessageRecord(getListAdapter().getSelectedItems()).getId(), Intent.ACTION_SEND); DcHelper.openForViewOrShare(getContext(), getSelectedMessageRecord(getListAdapter().getSelectedItems()).getId(), Intent.ACTION_SEND);
return true; return true;
case R.id.menu_context_details: } else if (itemId == R.id.menu_context_details) {
handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedItems())); handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
actionMode.finish(); actionMode.finish();
return true; return true;
case R.id.menu_context_forward: } else if (itemId == R.id.menu_context_forward) {
handleForwardMessage(getListAdapter().getSelectedItems()); handleForwardMessage(getListAdapter().getSelectedItems());
actionMode.finish(); actionMode.finish();
return true; return true;
case R.id.menu_add_to_home_screen: } else if (itemId == R.id.menu_add_to_home_screen) {
WebxdcActivity.addToHomeScreen(getActivity(), getSelectedMessageRecord(getListAdapter().getSelectedItems()).getId()); WebxdcActivity.addToHomeScreen(getActivity(), getSelectedMessageRecord(getListAdapter().getSelectedItems()).getId());
actionMode.finish(); actionMode.finish();
return true; return true;
case R.id.menu_context_save_attachment: } else if (itemId == R.id.menu_context_save_attachment) {
handleSaveAttachment(getListAdapter().getSelectedItems()); handleSaveAttachment(getListAdapter().getSelectedItems());
return true; return true;
case R.id.menu_context_reply: } else if (itemId == R.id.menu_context_reply) {
handleReplyMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems())); handleReplyMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
actionMode.finish(); actionMode.finish();
return true; return true;
case R.id.menu_context_reply_privately: } else if (itemId == R.id.menu_context_reply_privately) {
handleReplyMessagePrivately(getSelectedMessageRecord(getListAdapter().getSelectedItems())); handleReplyMessagePrivately(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
return true; return true;
case R.id.menu_resend: } else if (itemId == R.id.menu_resend) {
handleResendMessage(getListAdapter().getSelectedItems()); handleResendMessage(getListAdapter().getSelectedItems());
return true; return true;
} }
return false; return false;
} }

50
src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
View file

@ -421,31 +421,31 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case R.id.menu_new_chat: if (itemId == R.id.menu_new_chat) {
createChat(); createChat();
return true; return true;
case R.id.menu_invite_friends: } else if (itemId == R.id.menu_invite_friends) {
shareInvite(); shareInvite();
return true; return true;
case R.id.menu_settings: } else if (itemId == R.id.menu_settings) {
startActivity(new Intent(this, ApplicationPreferencesActivity.class)); startActivity(new Intent(this, ApplicationPreferencesActivity.class));
return true; return true;
case R.id.menu_qr: } else if (itemId == R.id.menu_qr) {
new IntentIntegrator(this).setCaptureActivity(QrActivity.class).initiateScan(); new IntentIntegrator(this).setCaptureActivity(QrActivity.class).initiateScan();
return true; return true;
case R.id.menu_global_map: } else if (itemId == R.id.menu_global_map) {
WebxdcActivity.openMaps(this, 0); WebxdcActivity.openMaps(this, 0);
return true; return true;
case R.id.menu_proxy_settings: } else if (itemId == R.id.menu_proxy_settings) {
startActivity(new Intent(this, ProxySettingsActivity.class)); startActivity(new Intent(this, ProxySettingsActivity.class));
return true; return true;
case android.R.id.home: } else if (itemId == android.R.id.home) {
onBackPressed(); onBackPressed();
return true; return true;
case R.id.menu_all_media: } else if (itemId == R.id.menu_all_media) {
startActivity(new Intent(this, ProfileActivity.class)); startActivity(new Intent(this, ProfileActivity.class));
return true; return true;
} }
return false; return false;

15
src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java
View file

@ -60,14 +60,13 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
onBackPressed(); onBackPressed();
return true; return true;
} else if (itemId == R.id.mark_as_read) {
case R.id.mark_as_read: DcHelper.getContext(this).marknoticedChat(DcChat.DC_CHAT_ID_ARCHIVED_LINK);
DcHelper.getContext(this).marknoticedChat(DcChat.DC_CHAT_ID_ARCHIVED_LINK); return true;
return true;
} }
return false; return false;

13
src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
View file

@ -97,13 +97,12 @@ public class CreateProfileActivity extends BaseActionBarActivity {
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
onBackPressed(); onBackPressed();
return true; return true;
case R.id.menu_create_profile: } else if (itemId == R.id.menu_create_profile) {
updateProfile(); updateProfile();
break;
} }
return false; return false;

61
src/main/java/org/thoughtcrime/securesms/FullMsgActivity.java
View file

@ -116,40 +116,39 @@ public class FullMsgActivity extends WebViewActivity
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { if (item.getItemId() == R.id.load_remote_content) {
case R.id.load_remote_content: AlertDialog.Builder builder = new AlertDialog.Builder(this)
AlertDialog.Builder builder = new AlertDialog.Builder(this) .setTitle(R.string.load_remote_content)
.setTitle(R.string.load_remote_content) .setMessage(R.string.load_remote_content_ask);
.setMessage(R.string.load_remote_content_ask);
// we are using the buttons "[Always] [Never][Once]" in that order. // we are using the buttons "[Always] [Never][Once]" in that order.
// 1. Checkmarks before [Always] and [Never] show the current state. // 1. Checkmarks before [Always] and [Never] show the current state.
// 2. [Once] is also shown in always-mode and disables always-mode if selected // 2. [Once] is also shown in always-mode and disables always-mode if selected
// (there was the idea to hide [Once] in always mode, but that looks more like a bug in the end) // (there was the idea to hide [Once] in always mode, but that looks more like a bug in the end)
// (maybe a usual Always-Checkbox and "[Cancel][OK]" buttons are an alternative, however, a [Once] // (maybe a usual Always-Checkbox and "[Cancel][OK]" buttons are an alternative, however, a [Once]
// would be required as well - probably as the leftmost button which is not that usable in // would be required as well - probably as the leftmost button which is not that usable in
// not-always-mode where the dialog is used more often. Or [Ok] would mean "Once" as well as "Change checkbox setting", // not-always-mode where the dialog is used more often. Or [Ok] would mean "Once" as well as "Change checkbox setting",
// which is also a bit weird. Anyway, let's give the three buttons a try :) // which is also a bit weird. Anyway, let's give the three buttons a try :)
final String checkmark = DynamicTheme.getCheckmarkEmoji(this) + " "; final String checkmark = DynamicTheme.getCheckmarkEmoji(this) + " ";
String alwaysCheckmark = ""; String alwaysCheckmark = "";
String onceCheckmark = ""; String onceCheckmark = "";
String neverCheckmark = ""; String neverCheckmark = "";
if (!blockLoadingRemote && Prefs.getAlwaysLoadRemoteContent(this)) { if (!blockLoadingRemote && Prefs.getAlwaysLoadRemoteContent(this)) {
alwaysCheckmark = checkmark; alwaysCheckmark = checkmark;
} else if (loadRemoteContent) { } else if (loadRemoteContent) {
onceCheckmark = checkmark; onceCheckmark = checkmark;
} else { } else {
neverCheckmark = checkmark; neverCheckmark = checkmark;
} }
if (!blockLoadingRemote) { if (!blockLoadingRemote) {
builder.setNeutralButton(alwaysCheckmark + getString(R.string.always), (dialog, which) -> onChangeLoadRemoteContent(LoadRemoteContent.ALWAYS)); builder.setNeutralButton(alwaysCheckmark + getString(R.string.always), (dialog, which) -> onChangeLoadRemoteContent(LoadRemoteContent.ALWAYS));
} }
builder.setNegativeButton(neverCheckmark + getString(blockLoadingRemote ? R.string.no : R.string.never), (dialog, which) -> onChangeLoadRemoteContent(LoadRemoteContent.NEVER)); builder.setNegativeButton(neverCheckmark + getString(blockLoadingRemote ? R.string.no : R.string.never), (dialog, which) -> onChangeLoadRemoteContent(LoadRemoteContent.NEVER));
builder.setPositiveButton(onceCheckmark + getString(R.string.once), (dialog, which) -> onChangeLoadRemoteContent(LoadRemoteContent.ONCE)); builder.setPositiveButton(onceCheckmark + getString(R.string.once), (dialog, which) -> onChangeLoadRemoteContent(LoadRemoteContent.ONCE));
builder.show(); builder.show();
return true; return true;
} }
return false; return false;
} }

28
src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
View file

@ -207,22 +207,22 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
@Override @Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
finish(); finish();
return true; return true;
case R.id.menu_create_group: } else if (itemId == R.id.menu_create_group) {
String groupName = getGroupName(); String groupName = getGroupName();
if (showGroupNameEmptyToast(groupName)) return true; if (showGroupNameEmptyToast(groupName)) return true;
if (groupChatId!=0) { if (groupChatId != 0) {
updateGroup(groupName); updateGroup(groupName);
} else { } else {
verified = !broadcast && allMembersVerified(); verified = !broadcast && allMembersVerified();
createGroup(groupName); createGroup(groupName);
} }
return true; return true;
} }
return false; return false;

8
src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
View file

@ -156,14 +156,14 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
getOnBackPressedDispatcher().onBackPressed(); getOnBackPressedDispatcher().onBackPressed();
return true; return true;
case R.id.menu_proxy_settings: } else if (itemId == R.id.menu_proxy_settings) {
startActivity(new Intent(this, ProxySettingsActivity.class)); startActivity(new Intent(this, ProxySettingsActivity.class));
return true; return true;
case R.id.menu_view_log: } else if (itemId == R.id.menu_view_log) {
startActivity(new Intent(this, LogViewActivity.class)); startActivity(new Intent(this, LogViewActivity.class));
return true; return true;
} }

32
src/main/java/org/thoughtcrime/securesms/LocalHelpActivity.java
View file

@ -57,22 +57,22 @@ public class LocalHelpActivity extends WebViewActivity
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case R.id.log_scroll_up: if (itemId == R.id.log_scroll_up) {
webView.scrollTo(0, 0); webView.scrollTo(0, 0);
return true; return true;
case R.id.learn_more: } else if (itemId == R.id.learn_more) {
openOnlineUrl("https://delta.chat"); openOnlineUrl("https://delta.chat");
return true; return true;
case R.id.privacy_policy: } else if (itemId == R.id.privacy_policy) {
openOnlineUrl("https://delta.chat/gdpr"); openOnlineUrl("https://delta.chat/gdpr");
return true; return true;
case R.id.contribute: } else if (itemId == R.id.contribute) {
openOnlineUrl("https://delta.chat/contribute"); openOnlineUrl("https://delta.chat/contribute");
return true; return true;
case R.id.report_issue: } else if (itemId == R.id.report_issue) {
openOnlineUrl("https://github.com/deltachat/deltachat-android/issues"); openOnlineUrl("https://github.com/deltachat/deltachat-android/issues");
return true; return true;
} }
return false; return false;
} }

72
src/main/java/org/thoughtcrime/securesms/LogViewActivity.java
View file

@ -54,42 +54,42 @@ public class LogViewActivity extends BaseActionBarActivity {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
Float newSize; Float newSize;
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
finish(); finish();
return true; return true;
case R.id.save_log: } else if (itemId == R.id.save_log) {
Permissions.with(this) Permissions.with(this)
.request(Manifest.permission.WRITE_EXTERNAL_STORAGE) .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
.alwaysGrantOnSdk30() .alwaysGrantOnSdk30()
.ifNecessary() .ifNecessary()
.onAllGranted(() -> { .onAllGranted(() -> {
File outputDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS); File outputDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
boolean success = logViewFragment.saveLogFile(outputDir) != null; boolean success = logViewFragment.saveLogFile(outputDir) != null;
new AlertDialog.Builder(this) new AlertDialog.Builder(this)
.setMessage(success? R.string.pref_saved_log : R.string.pref_save_log_failed) .setMessage(success ? R.string.pref_saved_log : R.string.pref_save_log_failed)
.setPositiveButton(android.R.string.ok, null) .setPositiveButton(android.R.string.ok, null)
.show(); .show();
}) })
.execute(); .execute();
return true; return true;
case R.id.share_log: } else if (itemId == R.id.share_log) {
shareLog(); shareLog();
return true; return true;
case R.id.log_zoom_in: } else if (itemId == R.id.log_zoom_in) {
newSize = logViewFragment.getLogTextSize() + 2.0f; newSize = logViewFragment.getLogTextSize() + 2.0f;
logViewFragment.setLogTextSize(newSize); logViewFragment.setLogTextSize(newSize);
return false; return false;
case R.id.log_zoom_out: } else if (itemId == R.id.log_zoom_out) {
newSize = logViewFragment.getLogTextSize() - 2.0f; newSize = logViewFragment.getLogTextSize() - 2.0f;
logViewFragment.setLogTextSize(newSize); logViewFragment.setLogTextSize(newSize);
return false; return false;
case R.id.log_scroll_down: } else if (itemId == R.id.log_scroll_down) {
logViewFragment.scrollDownLog(); logViewFragment.scrollDownLog();
return false; return false;
case R.id.log_scroll_up: } else if (itemId == R.id.log_scroll_up) {
logViewFragment.scrollUpLog(); logViewFragment.scrollUpLog();
return false; return false;
} }
return false; return false;

30
src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
View file

@ -390,14 +390,28 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case R.id.media_preview__edit: editAvatar(); return true; if (itemId == R.id.media_preview__edit) {
case R.id.media_preview__overview: showOverview(); return true; editAvatar();
case R.id.media_preview__share: share(); return true; return true;
case R.id.save: saveToDisk(); return true; } else if (itemId == R.id.media_preview__overview) {
case R.id.delete: deleteMedia(); return true; showOverview();
case R.id.show_in_chat: showInChat(); return true; return true;
case android.R.id.home: finish(); return true; } else if (itemId == R.id.media_preview__share) {
share();
return true;
} else if (itemId == R.id.save) {
saveToDisk();
return true;
} else if (itemId == R.id.delete) {
deleteMedia();
return true;
} else if (itemId == R.id.show_in_chat) {
showInChat();
return true;
} else if (itemId == android.R.id.home) {
finish();
return true;
} }
return false; return false;

56
src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
View file

@ -416,35 +416,27 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
backPressed = true; backPressed = true;
finish(); finish();
return true; return true;
case R.id.menu_mute_notifications: } else if (itemId == R.id.menu_mute_notifications) {
onNotifyOnOff(); onNotifyOnOff();
break; } else if (itemId == R.id.menu_sound) {
case R.id.menu_sound: onSoundSettings();
onSoundSettings(); } else if (itemId == R.id.menu_vibrate) {
break; onVibrateSettings();
case R.id.menu_vibrate: } else if (itemId == R.id.edit_name) {
onVibrateSettings(); onEditName();
break; } else if (itemId == R.id.share) {
case R.id.edit_name: onShare();
onEditName(); } else if (itemId == R.id.show_encr_info) {
break; onEncrInfo();
case R.id.share: } else if (itemId == R.id.block_contact) {
onShare(); onBlockContact();
break; } else if (itemId == R.id.menu_clone) {
case R.id.show_encr_info: onClone();
onEncrInfo();
break;
case R.id.block_contact:
onBlockContact();
break;
case R.id.menu_clone:
onClone();
break;
} }
return false; return false;
@ -453,10 +445,8 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
@Override @Override
public boolean onContextItemSelected(MenuItem item) { public boolean onContextItemSelected(MenuItem item) {
super.onContextItemSelected(item); super.onContextItemSelected(item);
switch (item.getItemId()) { if (item.getItemId() == R.id.copy_addr_to_clipboard) {
case R.id.copy_addr_to_clipboard: onCopyAddrToClipboard();
onCopyAddrToClipboard();
break;
} }
return false; return false;
} }

58
src/main/java/org/thoughtcrime/securesms/ProfileDocumentsFragment.java
View file

@ -248,35 +248,35 @@ public class ProfileDocumentsFragment
@Override @Override
public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) { public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
switch (menuItem.getItemId()) { int itemId = menuItem.getItemId();
case R.id.details: if (itemId == R.id.details) {
handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia())); handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
mode.finish(); mode.finish();
return true; return true;
case R.id.delete: } else if (itemId == R.id.delete) {
handleDeleteMessages(chatId, getListAdapter().getSelectedMedia()); handleDeleteMessages(chatId, getListAdapter().getSelectedMedia());
mode.finish(); mode.finish();
return true; return true;
case R.id.share: } else if (itemId == R.id.share) {
handleShare(getSelectedMessageRecord(getListAdapter().getSelectedMedia())); handleShare(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
return true; return true;
case R.id.menu_add_to_home_screen: } else if (itemId == R.id.menu_add_to_home_screen) {
WebxdcActivity.addToHomeScreen(getActivity(), getSelectedMessageRecord(getListAdapter().getSelectedMedia()).getId()); WebxdcActivity.addToHomeScreen(getActivity(), getSelectedMessageRecord(getListAdapter().getSelectedMedia()).getId());
mode.finish(); mode.finish();
return true; return true;
case R.id.show_in_chat: } else if (itemId == R.id.show_in_chat) {
handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia())); handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
return true; return true;
case R.id.save: } else if (itemId == R.id.save) {
handleSaveAttachment(getListAdapter().getSelectedMedia()); handleSaveAttachment(getListAdapter().getSelectedMedia());
return true; return true;
case R.id.menu_resend: } else if (itemId == R.id.menu_resend) {
handleResendMessage(getListAdapter().getSelectedMedia()); handleResendMessage(getListAdapter().getSelectedMedia());
return true; return true;
case R.id.menu_select_all: } else if (itemId == R.id.menu_select_all) {
getListAdapter().selectAll(); getListAdapter().selectAll();
updateActionModeBar(); updateActionModeBar();
return true; return true;
} }
return false; return false;
} }

50
src/main/java/org/thoughtcrime/securesms/ProfileGalleryFragment.java
View file

@ -233,31 +233,31 @@ public class ProfileGalleryFragment
@Override @Override
public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) { public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
switch (menuItem.getItemId()) { int itemId = menuItem.getItemId();
case R.id.details: if (itemId == R.id.details) {
handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia())); handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
mode.finish(); mode.finish();
return true; return true;
case R.id.delete: } else if (itemId == R.id.delete) {
handleDeleteMessages(chatId, getListAdapter().getSelectedMedia()); handleDeleteMessages(chatId, getListAdapter().getSelectedMedia());
mode.finish(); mode.finish();
return true; return true;
case R.id.share: } else if (itemId == R.id.share) {
handleShare(getSelectedMessageRecord(getListAdapter().getSelectedMedia())); handleShare(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
return true; return true;
case R.id.show_in_chat: } else if (itemId == R.id.show_in_chat) {
handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia())); handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
return true; return true;
case R.id.save: } else if (itemId == R.id.save) {
handleSaveAttachment(getListAdapter().getSelectedMedia()); handleSaveAttachment(getListAdapter().getSelectedMedia());
return true; return true;
case R.id.menu_resend: } else if (itemId == R.id.menu_resend) {
handleResendMessage(getListAdapter().getSelectedMedia()); handleResendMessage(getListAdapter().getSelectedMedia());
return true; return true;
case R.id.menu_select_all: } else if (itemId == R.id.menu_select_all) {
getListAdapter().selectAll(); getListAdapter().selectAll();
updateActionModeBar(); updateActionModeBar();
return true; return true;
} }
return false; return false;
} }

43
src/main/java/org/thoughtcrime/securesms/ProfileSettingsFragment.java
View file

@ -281,29 +281,28 @@ public class ProfileSettingsFragment extends Fragment
@Override @Override
public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) { public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
switch (menuItem.getItemId()) { if (menuItem.getItemId() == R.id.delete) {
case R.id.delete: final Collection<Integer> toDelIds = adapter.getSelectedMembers();
final Collection<Integer> toDelIds = adapter.getSelectedMembers(); StringBuilder readableToDelList = new StringBuilder();
StringBuilder readableToDelList = new StringBuilder(); for (Integer toDelId : toDelIds) {
for (Integer toDelId : toDelIds) { if (readableToDelList.length() > 0) {
if(readableToDelList.length()>0) { readableToDelList.append(", ");
readableToDelList.append(", ");
}
readableToDelList.append(dcContext.getContact(toDelId).getDisplayName());
} }
DcChat dcChat = dcContext.getChat(chatId); readableToDelList.append(dcContext.getContact(toDelId).getDisplayName());
AlertDialog dialog = new AlertDialog.Builder(getContext()) }
.setPositiveButton(R.string.remove_desktop, (d, which) -> { DcChat dcChat = dcContext.getChat(chatId);
for (Integer toDelId : toDelIds) { AlertDialog dialog = new AlertDialog.Builder(getContext())
dcContext.removeContactFromChat(chatId, toDelId); .setPositiveButton(R.string.remove_desktop, (d, which) -> {
} for (Integer toDelId : toDelIds) {
mode.finish(); dcContext.removeContactFromChat(chatId, toDelId);
}) }
.setNegativeButton(android.R.string.cancel, null) mode.finish();
.setMessage(getString(dcChat.isBroadcast()? R.string.ask_remove_from_broadcast : R.string.ask_remove_members, readableToDelList)) })
.show(); .setNegativeButton(android.R.string.cancel, null)
Util.redPositiveButton(dialog); .setMessage(getString(dcChat.isBroadcast() ? R.string.ask_remove_from_broadcast : R.string.ask_remove_members, readableToDelList))
return true; .show();
Util.redPositiveButton(dialog);
return true;
} }
return false; return false;
} }

36
src/main/java/org/thoughtcrime/securesms/WebViewActivity.java
View file

@ -254,24 +254,24 @@ public class WebViewActivity extends PassphraseRequiredActionBarActivity
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
finish(); finish();
return true; return true;
case R.id.menu_search_up: } else if (itemId == R.id.menu_search_up) {
if (lastQuery.isEmpty()) { if (lastQuery.isEmpty()) {
webView.scrollTo(0, 0); webView.scrollTo(0, 0);
} else { } else {
webView.findNext(false); webView.findNext(false);
} }
return true; return true;
case R.id.menu_search_down: } else if (itemId == R.id.menu_search_down) {
if (lastQuery.isEmpty()) { if (lastQuery.isEmpty()) {
webView.scrollTo(0, 1000000000); webView.scrollTo(0, 1000000000);
} else { } else {
webView.findNext(true); webView.findNext(true);
} }
return true; return true;
} }
return false; return false;
} }

20
src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java
View file

@ -285,16 +285,16 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case R.id.menu_add_to_home_screen: if (itemId == R.id.menu_add_to_home_screen) {
addToHomeScreen(this, dcAppMsg.getId()); addToHomeScreen(this, dcAppMsg.getId());
return true; return true;
case R.id.source_code: } else if (itemId == R.id.source_code) {
IntentUtils.showInBrowser(this, sourceCodeUrl); IntentUtils.showInBrowser(this, sourceCodeUrl);
return true; return true;
case R.id.show_in_chat: } else if (itemId == R.id.show_in_chat) {
showInChat(); showInChat();
return true; return true;
} }
return false; return false;
} }

11
src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java
View file

@ -108,16 +108,13 @@ public class AccountSelectionListFragment extends DialogFragment
} }
private void onContextItemSelected(MenuItem item, int accountId) { private void onContextItemSelected(MenuItem item, int accountId) {
switch (item.getItemId()) { int itemId = item.getItemId();
case R.id.delete: if (itemId == R.id.delete) {
onDeleteAccount(accountId); onDeleteAccount(accountId);
break; } else if (itemId == R.id.menu_mute_notifications) {
case R.id.menu_mute_notifications:
onToggleMute(accountId); onToggleMute(accountId);
break; } else if (itemId == R.id.menu_set_tag) {
case R.id.menu_set_tag:
onSetTag(accountId); onSetTag(accountId);
break;
} }
} }

48
src/main/java/org/thoughtcrime/securesms/contacts/NewContactActivity.java
View file

@ -68,31 +68,31 @@ public class NewContactActivity extends PassphraseRequiredActionBarActivity
@Override @Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
finish(); finish();
return true; return true;
case R.id.menu_create_contact: } else if (itemId == R.id.menu_create_contact) {
String addr = addrInput.getText() == null? "" : addrInput.getText().toString(); String addr = addrInput.getText() == null ? "" : addrInput.getText().toString();
String name = nameInput.getText() == null? "" : nameInput.getText().toString(); String name = nameInput.getText() == null ? "" : nameInput.getText().toString();
if (name.isEmpty()) name = null; if (name.isEmpty()) name = null;
int contactId = dcContext.mayBeValidAddr(addr)? dcContext.createContact(name, addr): 0; int contactId = dcContext.mayBeValidAddr(addr) ? dcContext.createContact(name, addr) : 0;
if (contactId == 0) { if (contactId == 0) {
Toast.makeText(this, getString(R.string.login_error_mail), Toast.LENGTH_LONG).show(); Toast.makeText(this, getString(R.string.login_error_mail), Toast.LENGTH_LONG).show();
return true;
}
if (getCallingActivity() != null) { // called for result
Intent intent = new Intent();
intent.putExtra(ADDR_EXTRA, addr);
setResult(RESULT_OK, intent);
} else {
int chatId = dcContext.createChatByContactId(contactId);
Intent intent = new Intent(this, ConversationActivity.class);
intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, chatId);
startActivity(intent);
}
finish();
return true; return true;
}
if (getCallingActivity() != null) { // called for result
Intent intent = new Intent();
intent.putExtra(ADDR_EXTRA, addr);
setResult(RESULT_OK, intent);
} else {
int chatId = dcContext.createChatByContactId(contactId);
Intent intent = new Intent(this, ConversationActivity.class);
intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, chatId);
startActivity(intent);
}
finish();
return true;
} }
return false; return false;
} }

15
src/main/java/org/thoughtcrime/securesms/qr/BackupProviderFragment.java
View file

@ -143,14 +143,13 @@ public class BackupProviderFragment extends Fragment implements DcEventCenter.Dc
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { if (item.getItemId() == R.id.copy) {
case R.id.copy: if (dcBackupProvider != null) {
if (dcBackupProvider != null) { Util.writeTextToClipboard(getActivity(), dcBackupProvider.getQr());
Util.writeTextToClipboard(getActivity(), dcBackupProvider.getQr()); Toast.makeText(getActivity(), getString(R.string.done), Toast.LENGTH_SHORT).show();
Toast.makeText(getActivity(), getString(R.string.done), Toast.LENGTH_SHORT).show(); getTransferActivity().warnAboutCopiedQrCodeOnAbort = true;
getTransferActivity().warnAboutCopiedQrCodeOnAbort = true; }
} return true;
return true;
} }
return false; return false;

22
src/main/java/org/thoughtcrime/securesms/qr/BackupTransferActivity.java
View file

@ -112,17 +112,17 @@ public class BackupTransferActivity extends BaseActionBarActivity {
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
finishOrAskToFinish(); finishOrAskToFinish();
return true; return true;
case R.id.troubleshooting: } else if (itemId == R.id.troubleshooting) {
DcHelper.openHelp(this, "#multiclient"); DcHelper.openHelp(this, "#multiclient");
return true; return true;
case R.id.view_log_button: } else if (itemId == R.id.view_log_button) {
startActivity(new Intent(this, LogViewActivity.class)); startActivity(new Intent(this, LogViewActivity.class));
return true; return true;
} }
return false; return false;
} }

32
src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
View file

@ -126,24 +126,20 @@ public class QrActivity extends BaseActionBarActivity implements View.OnClickLis
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
finish(); finish();
return true; return true;
case R.id.new_classic_contact: } else if (itemId == R.id.new_classic_contact) {
this.startActivity(new Intent(this, NewContactActivity.class)); this.startActivity(new Intent(this, NewContactActivity.class));
break; } else if (itemId == R.id.withdraw) {
case R.id.withdraw: qrShowFragment.withdrawQr();
qrShowFragment.withdrawQr(); } else if (itemId == R.id.load_from_image) {
break; AttachmentManager.selectImage(this, REQUEST_CODE_IMAGE);
case R.id.load_from_image: } else if (itemId == R.id.paste) {
AttachmentManager.selectImage(this, REQUEST_CODE_IMAGE); QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
break; qrCodeHandler.handleQrData(Util.getTextFromClipboard(this));
case R.id.paste: }
QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
qrCodeHandler.handleQrData(Util.getTextFromClipboard(this));
break;
}
return false; return false;
} }

15
src/main/java/org/thoughtcrime/securesms/qr/QrShowActivity.java
View file

@ -83,14 +83,13 @@ public class QrShowActivity extends AppCompatActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
finish(); finish();
return true; return true;
case R.id.withdraw: } else if (itemId == R.id.withdraw) {
fragment.withdrawQr(); fragment.withdrawQr();
break; }
}
return false; return false;
} }

28
src/main/java/org/thoughtcrime/securesms/qr/RegistrationQrActivity.java
View file

@ -77,20 +77,20 @@ public class RegistrationQrActivity extends BaseActionBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
finish(); finish();
return true; return true;
case R.id.troubleshooting: } else if (itemId == R.id.troubleshooting) {
DcHelper.openHelp(this, "#multiclient"); DcHelper.openHelp(this, "#multiclient");
return true; return true;
case R.id.menu_paste: } else if (itemId == R.id.menu_paste) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra(QRDATA_EXTRA, Util.getTextFromClipboard(this)); intent.putExtra(QRDATA_EXTRA, Util.getTextFromClipboard(this));
setResult(Activity.RESULT_OK, intent); setResult(Activity.RESULT_OK, intent);
finish(); finish();
return true; return true;
} }
return false; return false;
} }