Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Move Up button handling into BaseFragment

Browse Source
This commit is contained in:
Torsten Grote
2016-10-13 15:08:41 -03:00
parent d5f6e71cba
commit c934ec30aa
9 changed files with 18 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
briar-android/src/org/briarproject/android/sharing/BaseMessageFragment.java
View File

@@ -32,9 +32,6 @@ abstract class BaseMessageFragment extends BaseFragment
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// allow for "up" button to act as back button
setHasOptionsMenu(true);
// inflate view
View v = inflater.inflate(R.layout.fragment_message, container,
false);
@@ -59,17 +56,6 @@ abstract class BaseMessageFragment extends BaseFragment
message.showSoftKeyboard();
}
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
listener.onBackPressed();
return true;
default:
return super.onOptionsItemSelected(item);
}
}
@Override
public void onSendClick(String msg) {
// disable button to prevent accidental double actions

4
briar-android/src/org/briarproject/android/sharing/ContactSelectorFragment.java
View File

@@ -84,7 +84,6 @@ public class ContactSelectorFragment extends BaseFragment implements
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
Bundle args = getArguments();
byte[] b = args.getByteArray(GROUP_ID);
if (b == null) throw new IllegalStateException("No GroupId");
@@ -156,9 +155,6 @@ public class ContactSelectorFragment extends BaseFragment implements
public boolean onOptionsItemSelected(final MenuItem item) {
// Handle presses on the action bar items
switch (item.getItemId()) {
case android.R.id.home:
listener.onBackPressed();
return true;
case R.id.action_contacts_selected:
selectedContacts = adapter.getSelectedContactIds();
listener.contactsSelected(groupId, selectedContacts);