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

TunnelListFragment: Name a CompletionStage what it is

Browse Source 
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2018-01-07 00:26:08 -06:00
parent 1862ff0bbe
commit 77fdd7c883
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ public class TunnelListFragment extends BaseFragment {
if (activity == null) if (activity == null)
return; return;
final ContentResolver contentResolver = activity.getContentResolver(); final ContentResolver contentResolver = activity.getContentResolver();
final CompletionStage<String> nameFuture = asyncWorker.supplyAsync(() -> { final CompletionStage<String> nameStage = asyncWorker.supplyAsync(() -> {
final String[] columns = {OpenableColumns.DISPLAY_NAME}; final String[] columns = {OpenableColumns.DISPLAY_NAME};
String name = null; String name = null;
try (final Cursor cursor = contentResolver.query(uri, columns, null, null, null)) { try (final Cursor cursor = contentResolver.query(uri, columns, null, null, null)) {
@ -80,7 +80,7 @@ public class TunnelListFragment extends BaseFragment {
return name; return name;
}); });
asyncWorker.supplyAsync(() -> Config.from(contentResolver.openInputStream(uri))) 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()) .thenCompose(Function.identity())
.handle(this::onTunnelImportFinished); .handle(this::onTunnelImportFinished);
} }