ProfileActivity: Do not use onClick for menus

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Samuel Holland 2017-08-09 07:28:04 -05:00
parent 7d2d9f0cb3
commit 671aae7489
3 changed files with 27 additions and 6 deletions

View File

@ -51,13 +51,9 @@ abstract class ProfileActivity extends ServiceClientActivity<ProfileServiceInter
return true; return true;
} }
public void onMenuEdit(MenuItem item) { public abstract void onMenuEdit(MenuItem item);
} public abstract void onMenuSave(MenuItem item);
public void onMenuSave(MenuItem item) {
}
public void onMenuSettings(MenuItem item) { public void onMenuSettings(MenuItem item) {

View File

@ -2,6 +2,7 @@ package com.wireguard.android;
import android.app.Fragment; import android.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
import android.view.MenuItem;
/** /**
* Activity that allows viewing information about a single WireGuard profile. * Activity that allows viewing information about a single WireGuard profile.
@ -16,4 +17,14 @@ public class ProfileDetailActivity extends ProfileActivity {
Fragment detailFragment = getFragmentManager().findFragmentByTag(TAG_DETAIL); Fragment detailFragment = getFragmentManager().findFragmentByTag(TAG_DETAIL);
((ProfileDetailFragment) detailFragment).setProfile(getCurrentProfile()); ((ProfileDetailFragment) detailFragment).setProfile(getCurrentProfile());
} }
@Override
public void onMenuEdit(MenuItem item) {
}
@Override
public void onMenuSave(MenuItem item) {
throw new IllegalStateException();
}
} }

View File

@ -4,6 +4,7 @@ import android.app.Fragment;
import android.app.FragmentTransaction; import android.app.FragmentTransaction;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.MenuItem;
/** /**
* Activity that allows creating/viewing/editing/deleting WireGuard profiles. * Activity that allows creating/viewing/editing/deleting WireGuard profiles.
@ -36,7 +37,20 @@ public class ProfileListActivity extends ProfileActivity {
onProfileSelected(getCurrentProfile()); onProfileSelected(getCurrentProfile());
} }
@Override
public void onMenuEdit(MenuItem item) {
setIsEditing(true);
}
@Override
public void onMenuSave(MenuItem item) {
setIsEditing(false);
}
public void onProfileSelected(String profile) { public void onProfileSelected(String profile) {
setIsEditing(false);
if (isSplitLayout) { if (isSplitLayout) {
updateLayout(profile); updateLayout(profile);
setCurrentProfile(profile); setCurrentProfile(profile);