diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-06 04:50:51 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-06 18:17:58 +0200 |
| commit | 7078162c690abdf618d801035dd3b940ffcfd0fc (patch) | |
| tree | 9be679db43c13c1e3120d0d4bcc0796a2b6af457 | |
| parent | tools: update wg-quick for ExcludedApplications support (diff) | |
| download | wireguard-android-7078162c690abdf618d801035dd3b940ffcfd0fc.tar.xz wireguard-android-7078162c690abdf618d801035dd3b940ffcfd0fc.zip | |
AppListDialogFragment: add deselect all button
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java | 9 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java b/app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java index 1c11bd41..15571297 100644 --- a/app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java @@ -9,6 +9,7 @@ package com.wireguard.android.fragment; import android.app.Activity; import android.app.Dialog; import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; @@ -73,13 +74,19 @@ public class AppListDialogFragment extends DialogFragment { alertDialogBuilder.setPositiveButton(R.string.set_exclusions, (dialog, which) -> setExclusionsAndDismiss()); alertDialogBuilder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss()); + alertDialogBuilder.setNeutralButton(R.string.deselect_all, (dialog, which) -> { }); binding.setFragment(this); binding.setAppData(appData); loadData(); - return alertDialogBuilder.create(); + final AlertDialog dialog = alertDialogBuilder.create(); + dialog.setOnShowListener(d -> dialog.getButton(DialogInterface.BUTTON_NEUTRAL).setOnClickListener(view -> { + for (final ApplicationData app : appData) + app.setExcludedFromTunnel(false); + })); + return dialog; } private void loadData() { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b4105d2d..defd4370 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,6 +34,7 @@ <string name="dark_theme_summary_on">Currently using dark night theme</string> <string name="dark_theme_summary_off">Currently using light day theme</string> <string name="delete">Delete</string> + <string name="deselect_all">Deselect All</string> <string name="select_all">Select all</string> <string name="dns_servers">DNS servers</string> <string name="edit">Edit</string> |