frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

project: Global cleanup

Browse Source 
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland
2018-01-08 02:19:13 -06:00
parent 88e30431cb
commit d645d69847
22 changed files with 112 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/wireguard/android/fragment/ConfigEditorFragment.java → app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
+5 -5
View File
@@ -19,7 +19,7 @@ import com.commonsware.cwac.crossport.design.widget.CoordinatorLayout;
import com.commonsware.cwac.crossport.design.widget.Snackbar;
import com.wireguard.android.Application;
import com.wireguard.android.R;
import com.wireguard.android.databinding.ConfigEditorFragmentBinding;
import com.wireguard.android.databinding.TunnelEditorFragmentBinding;
import com.wireguard.android.model.Tunnel;
import com.wireguard.android.model.TunnelManager;
import com.wireguard.android.util.ExceptionLoggers;
@@ -29,14 +29,14 @@ import com.wireguard.config.Config;
* Fragment for editing a WireGuard configuration.
*/
public class ConfigEditorFragment extends BaseFragment {
public class TunnelEditorFragment extends BaseFragment {
private static final String KEY_LOCAL_CONFIG = "local_config";
private static final String KEY_LOCAL_NAME = "local_name";
private static final String KEY_ORIGINAL_NAME = "original_name";
private static final String TAG = ConfigEditorFragment.class.getSimpleName();
private static final String TAG = TunnelEditorFragment.class.getSimpleName();
private final ObservableField<String> localName = new ObservableField<>("");
private ConfigEditorFragmentBinding binding;
private TunnelEditorFragmentBinding binding;
private boolean isViewStateRestored;
private Config localConfig = new Config();
private Tunnel localTunnel;
@@ -107,7 +107,7 @@ public class ConfigEditorFragment extends BaseFragment {
public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
final Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState);
binding = ConfigEditorFragmentBinding.inflate(inflater, container, false);
binding = TunnelEditorFragmentBinding.inflate(inflater, container, false);
binding.executePendingBindings();
return binding.getRoot();
}
app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
+4 -6
View File
@@ -82,7 +82,7 @@ public class TunnelListFragment extends BaseFragment {
asyncWorker.supplyAsync(() -> Config.from(contentResolver.openInputStream(uri)))
.thenCombine(nameStage, (config, name) -> tunnelManager.create(name, config))
.thenCompose(Function.identity())
.handle(this::onTunnelImportFinished);
.whenComplete(this::onTunnelImportFinished);
}
@Override
@@ -142,7 +142,7 @@ public class TunnelListFragment extends BaseFragment {
// Do nothing.
}
private Void onTunnelDeletionFinished(final Integer count, final Throwable throwable) {
private void onTunnelDeletionFinished(final Integer count, final Throwable throwable) {
final String message;
if (throwable == null) {
message = "Successfully deleted " + count + " tunnels";
@@ -155,10 +155,9 @@ public class TunnelListFragment extends BaseFragment {
final CoordinatorLayout container = binding.mainContainer;
Snackbar.make(container, message, Snackbar.LENGTH_LONG).show();
}
return null;
}
private Void onTunnelImportFinished(final Tunnel tunnel, final Throwable throwable) {
private void onTunnelImportFinished(final Tunnel tunnel, final Throwable throwable) {
final String message;
if (throwable == null) {
message = "Successfully imported tunnel '" + tunnel.getName() + '\'';
@@ -171,7 +170,6 @@ public class TunnelListFragment extends BaseFragment {
final CoordinatorLayout container = binding.mainContainer;
Snackbar.make(container, message, Snackbar.LENGTH_LONG).show();
}
return null;
}
@Override
@@ -202,7 +200,7 @@ public class TunnelListFragment extends BaseFragment {
.toArray(CompletableFuture[]::new);
CompletableFuture.allOf(futures)
.thenApply(x -> futures.length)
.handle(TunnelListFragment.this::onTunnelDeletionFinished);
.whenComplete(TunnelListFragment.this::onTunnelDeletionFinished);
mode.finish();
return true;
default: