aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/src/main/java/com/wireguard/android/preference
diff options
context:
space:
mode:
authorEric Kuck <eric@bluelinelabs.com>2018-07-25 19:30:34 -0500
committerJason A. Donenfeld <Jason@zx2c4.com>2018-07-26 05:17:43 +0200
commit6cd03a28987e1b646369c16f2d8f10e49c77828d (patch)
treed88fa5ef4fa4e53d605e6bce9d788960a80642de /app/src/main/java/com/wireguard/android/preference
parentApplication: use proper completablefuture for backend (diff)
downloadwireguard-android-6cd03a28987e1b646369c16f2d8f10e49c77828d.tar.xz
wireguard-android-6cd03a28987e1b646369c16f2d8f10e49c77828d.zip
TunnelDetailFragment now restores state correctly after process death
Diffstat (limited to 'app/src/main/java/com/wireguard/android/preference')
-rw-r--r--app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java b/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java
index a1477214..140cffa3 100644
--- a/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java
+++ b/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java
@@ -48,7 +48,10 @@ public class ZipExporterPreference extends Preference {
}
private void exportZip() {
- final List<Tunnel> tunnels = new ArrayList<>(Application.getTunnelManager().getTunnels());
+ Application.getTunnelManager().getTunnels().thenAccept(this::exportZip);
+ }
+
+ private void exportZip(final List<Tunnel> tunnels) {
final List<CompletableFuture<Config>> futureConfigs = new ArrayList<>(tunnels.size());
for (final Tunnel tunnel : tunnels)
futureConfigs.add(tunnel.getConfigAsync().toCompletableFuture());