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

TunnelListFragment: Fix crash on deleting multiple tunnels

Browse Source 
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2018-01-08 04:31:30 -06:00
parent b6ed17884f
commit c40555c1bd
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
View File

@ -38,10 +38,14 @@ import com.wireguard.android.util.AsyncWorker;
import com.wireguard.android.util.ExceptionLoggers; import com.wireguard.android.util.ExceptionLoggers;
import com.wireguard.config.Config; import com.wireguard.config.Config;
import java.util.List;
import java9.util.concurrent.CompletableFuture; import java9.util.concurrent.CompletableFuture;
import java9.util.concurrent.CompletionStage; import java9.util.concurrent.CompletionStage;
import java9.util.function.Function; import java9.util.function.Function;
import java9.util.stream.Collectors;
import java9.util.stream.IntStream; import java9.util.stream.IntStream;
import java9.util.stream.StreamSupport;
/** /**
* Fragment containing a list of known WireGuard tunnels. It allows creating and deleting tunnels. * Fragment containing a list of known WireGuard tunnels. It allows creating and deleting tunnels.
@ -194,8 +198,11 @@ public class TunnelListFragment extends BaseFragment {
public boolean onActionItemClicked(final ActionMode mode, final MenuItem item) { public boolean onActionItemClicked(final ActionMode mode, final MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.menu_action_delete: case R.id.menu_action_delete:
final CompletableFuture[] futures = getCheckedPositions() // Must operate in two steps: positions change once we start deleting things.
final List<Tunnel> tunnelsToDelete = getCheckedPositions()
.mapToObj(pos -> (Tunnel) tunnelList.getItemAtPosition(pos)) .mapToObj(pos -> (Tunnel) tunnelList.getItemAtPosition(pos))
.collect(Collectors.toList());
final CompletableFuture[] futures = StreamSupport.stream(tunnelsToDelete)
.map(Tunnel::delete) .map(Tunnel::delete)
.toArray(CompletableFuture[]::new); .toArray(CompletableFuture[]::new);
CompletableFuture.allOf(futures) CompletableFuture.allOf(futures)