ConfigAddActivity: Add an standalone config-creating activity

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Samuel Holland
2017-08-15 17:36:11 -05:00
parent e9de916d69
commit 61d6b89bbe
5 changed files with 57 additions and 2 deletions
@@ -0,0 +1,37 @@
package com.wireguard.android;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.os.Bundle;
import com.wireguard.config.Config;
/**
* Standalone activity for creating configurations.
*/
public class ConfigAddActivity extends BaseConfigActivity {
@Override
public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.config_add_activity);
}
@Override
protected void onCurrentConfigChanged(final Config config) {
// This is the result of ConfigEditFragment signalling that a configuration was created.
if (config != null)
finish();
}
@Override
protected void onServiceAvailable() {
super.onServiceAvailable();
final FragmentManager fm = getFragmentManager();
if (fm.findFragmentById(R.id.master_fragment) == null) {
final FragmentTransaction transaction = fm.beginTransaction();
transaction.add(R.id.master_fragment, new ConfigEditFragment());
transaction.commit();
}
}
}
@@ -12,6 +12,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.Toast;
import com.wireguard.android.databinding.ConfigEditFragmentBinding;
import com.wireguard.config.Config;
@@ -73,7 +74,15 @@ public class ConfigEditFragment extends BaseConfigFragment {
private void saveConfig() {
// FIXME: validate input
VpnService.getInstance().update(getCurrentConfig().getName(), localConfig);
try {
if (getCurrentConfig() != null)
VpnService.getInstance().update(getCurrentConfig().getName(), localConfig);
else
VpnService.getInstance().add(localConfig);
} catch (final IllegalStateException e) {
Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show();
return;
}
// Hide the keyboard; it rarely goes away on its own.
final BaseConfigActivity activity = (BaseConfigActivity) getActivity();
final View focusedView = activity.getCurrentFocus();
@@ -83,7 +92,7 @@ public class ConfigEditFragment extends BaseConfigFragment {
inputManager.hideSoftInputFromWindow(focusedView.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS);
}
// Tell the activity to go back to the detail view.
// Tell the activity to finish itself or go back to the detail view.
activity.setCurrentConfig(localConfig);
}
}