Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AddActivity: Update for ConfigEditFragment changes

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Samuel Holland 2017-08-24 01:27:56 -05:00
parent e2df9931ac
commit e446870ac1
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/wireguard/android/AddActivity.java
View File

@ -19,8 +19,13 @@ public class AddActivity extends BaseConfigActivity {
@Override @Override
protected void onCurrentConfigChanged(final Config config) { protected void onCurrentConfigChanged(final Config config) {
// This is the result of ConfigEditFragment signalling that a configuration was created. // Do nothing (this never happens).
if (config != null) }
@Override
protected void onEditingStateChanged(final boolean isEditing) {
// Go back to the main activity once the new configuration is created.
if (!isEditing)
finish(); finish();
} }
@ -28,10 +33,14 @@ public class AddActivity extends BaseConfigActivity {
protected void onServiceAvailable() { protected void onServiceAvailable() {
super.onServiceAvailable(); super.onServiceAvailable();
final FragmentManager fm = getFragmentManager(); final FragmentManager fm = getFragmentManager();
if (fm.findFragmentById(R.id.master_fragment) == null) { ConfigEditFragment fragment = (ConfigEditFragment) fm.findFragmentById(R.id.master_fragment);
if (fragment == null) {
fragment = new ConfigEditFragment();
final FragmentTransaction transaction = fm.beginTransaction(); final FragmentTransaction transaction = fm.beginTransaction();
transaction.add(R.id.master_fragment, new ConfigEditFragment()); transaction.add(R.id.master_fragment, fragment);
transaction.commit(); transaction.commit();
} }
// Prime the state for the fragment to tell us it is finished.
setIsEditing(true);
} }
} }