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

android: Directly use views for snackbars

Browse Source 
There should be no need to deference an extra variable.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2018-05-16 11:23:12 +05:30 committed by Jason A. Donenfeld
parent 515be5e453
commit 9c3091456d
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
View File

@ -10,7 +10,6 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -59,8 +58,7 @@ public class TunnelEditorFragment extends BaseFragment {
message = getString(R.string.config_save_error, savedTunnel.getName(), error); message = getString(R.string.config_save_error, savedTunnel.getName(), error);
Log.e(TAG, message, throwable); Log.e(TAG, message, throwable);
if (binding != null) { if (binding != null) {
final CoordinatorLayout container = binding.mainContainer; Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show();
Snackbar.make(container, message, Snackbar.LENGTH_LONG).show();
} }
} }
} }
@ -125,8 +123,7 @@ public class TunnelEditorFragment extends BaseFragment {
final String tunnelName = tunnel == null ? binding.getConfig().getName() : tunnel.getName(); final String tunnelName = tunnel == null ? binding.getConfig().getName() : tunnel.getName();
final String message = getString(R.string.config_save_error, tunnelName, error); final String message = getString(R.string.config_save_error, tunnelName, error);
Log.e(TAG, message, e); Log.e(TAG, message, e);
final CoordinatorLayout container = binding.mainContainer; Snackbar.make(binding.mainContainer, error, Snackbar.LENGTH_LONG).show();
Snackbar.make(container, error, Snackbar.LENGTH_LONG).show();
return false; return false;
} }
if (tunnel == null) { if (tunnel == null) {
@ -178,8 +175,7 @@ public class TunnelEditorFragment extends BaseFragment {
message = getString(R.string.tunnel_create_error, error); message = getString(R.string.tunnel_create_error, error);
Log.e(TAG, message, throwable); Log.e(TAG, message, throwable);
if (binding != null) { if (binding != null) {
final CoordinatorLayout container = binding.mainContainer; Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show();
Snackbar.make(container, message, Snackbar.LENGTH_LONG).show();
} }
} }
} }
@ -198,8 +194,7 @@ public class TunnelEditorFragment extends BaseFragment {
message = getString(R.string.tunnel_rename_error, error); message = getString(R.string.tunnel_rename_error, error);
Log.e(TAG, message, throwable); Log.e(TAG, message, throwable);
if (binding != null) { if (binding != null) {
final CoordinatorLayout container = binding.mainContainer; Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show();
Snackbar.make(container, message, Snackbar.LENGTH_LONG).show();
} }
} }
} }

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

@ -16,7 +16,6 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.provider.OpenableColumns; import android.provider.OpenableColumns;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.util.Log; import android.util.Log;
import android.util.SparseBooleanArray; import android.util.SparseBooleanArray;
@ -142,7 +141,8 @@ public class TunnelListFragment extends BaseFragment {
} }
} }
} else { } else {
futureTunnels.add(tunnelManager.create(name, Config.from(contentResolver.openInputStream(uri))).toCompletableFuture()); futureTunnels.add(tunnelManager.create(name,
Config.from(contentResolver.openInputStream(uri))).toCompletableFuture());
} }
if (futureTunnels.isEmpty()) { if (futureTunnels.isEmpty()) {
@ -244,8 +244,7 @@ public class TunnelListFragment extends BaseFragment {
Log.e(TAG, message, throwable); Log.e(TAG, message, throwable);
} }
if (binding != null) { if (binding != null) {
final CoordinatorLayout container = binding.mainContainer; Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show();
Snackbar.make(container, message, Snackbar.LENGTH_LONG).show();
} }
} }
@ -271,8 +270,7 @@ public class TunnelListFragment extends BaseFragment {
tunnels.size(), tunnels.size() + throwables.size()); tunnels.size(), tunnels.size() + throwables.size());
if (binding != null) { if (binding != null) {
final CoordinatorLayout container = binding.mainContainer; Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show();
Snackbar.make(container, message, Snackbar.LENGTH_LONG).show();
} }
} }