浏览代码

AppListDialogFragment: Revamp toggle logic

Rather than always toggle all elements, elect to unselect all if any are selected. This allows
returning to a clean state in at most two clicks.

Suggested-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
master
Harsh Shandilya 4 年前
父节点
当前提交
6f6602ddd1
共有 1 个文件被更改,包括 7 次插入1 次删除
  1. +7
    -1
      app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java

+ 7
- 1
app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java 查看文件

@@ -31,6 +31,8 @@ import java.util.Collections;
import java.util.List;

import java9.util.Comparators;
import java9.util.stream.Collectors;
import java9.util.stream.StreamSupport;

public class AppListDialogFragment extends DialogFragment {

@@ -109,8 +111,12 @@ public class AppListDialogFragment extends DialogFragment {

final AlertDialog dialog = alertDialogBuilder.create();
dialog.setOnShowListener(d -> dialog.getButton(DialogInterface.BUTTON_NEUTRAL).setOnClickListener(view -> {
final List<ApplicationData> selectedItems = StreamSupport.stream(appData)
.filter(ApplicationData::isExcludedFromTunnel)
.collect(Collectors.toList());
final boolean excludeAll = selectedItems.isEmpty();
for (final ApplicationData app : appData)
app.setExcludedFromTunnel(!app.isExcludedFromTunnel());
app.setExcludedFromTunnel(excludeAll);
}));
return dialog;
}


正在加载...
取消
保存