aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2018-01-07 00:26:08 -0600
committerSamuel Holland <samuel@sholland.org>2018-01-07 00:26:08 -0600
commit77fdd7c883086e698c83b2a2f5e58ff62359c5ea (patch)
treef0f23eb3f7e8f7dc61ce06553b65b001a33fbf49
parentTunnel: The name passed to isNameValid is never null (diff)
downloadwireguard-android-77fdd7c883086e698c83b2a2f5e58ff62359c5ea.tar.xz
wireguard-android-77fdd7c883086e698c83b2a2f5e58ff62359c5ea.zip
TunnelListFragment: Name a CompletionStage what it is
Signed-off-by: Samuel Holland <samuel@sholland.org>
-rw-r--r--app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
index e712c4a0..e174634d 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
@@ -63,7 +63,7 @@ public class TunnelListFragment extends BaseFragment {
if (activity == null)
return;
final ContentResolver contentResolver = activity.getContentResolver();
- final CompletionStage<String> nameFuture = asyncWorker.supplyAsync(() -> {
+ final CompletionStage<String> nameStage = asyncWorker.supplyAsync(() -> {
final String[] columns = {OpenableColumns.DISPLAY_NAME};
String name = null;
try (final Cursor cursor = contentResolver.query(uri, columns, null, null, null)) {
@@ -80,7 +80,7 @@ public class TunnelListFragment extends BaseFragment {
return name;
});
asyncWorker.supplyAsync(() -> Config.from(contentResolver.openInputStream(uri)))
- .thenCombine(nameFuture, (config, name) -> tunnelManager.create(name, config))
+ .thenCombine(nameStage, (config, name) -> tunnelManager.create(name, config))
.thenCompose(Function.identity())
.handle(this::onTunnelImportFinished);
}