diff options
author | Harsh Shandilya <me@msfjarvis.dev> | 2018-04-27 22:59:24 +0530 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-04-28 06:07:48 +0200 |
commit | ba862b166bd30de8c15593ed3b8dfd457eb39d36 (patch) | |
tree | 8f4f08ccec905f27062a4bb337a6c44185726e9a /app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java | |
parent | Version bump (diff) | |
download | wireguard-android-ba862b166bd30de8c15593ed3b8dfd457eb39d36.tar.xz wireguard-android-ba862b166bd30de8c15593ed3b8dfd457eb39d36.zip |
Quick cleanup across the board
- Clean up imports
- Adjust method visibility
- Drop in NonNull annotations where needed
- Prevent potential NPEs from nulled getActivity calls
- Remove unused methods
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java')
-rw-r--r-- | app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java | 6 |
1 files changed, 4 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 352fbfbd..f1c76ab4 100644 --- a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java @@ -9,6 +9,7 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.provider.OpenableColumns; +import android.support.annotation.NonNull; import android.util.Log; import android.util.SparseBooleanArray; import android.view.ActionMode; @@ -110,7 +111,7 @@ public class TunnelListFragment extends BaseFragment { } @Override - public View onCreateView(final LayoutInflater inflater, final ViewGroup container, + public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState); binding = TunnelListFragmentBinding.inflate(inflater, container, false); @@ -220,7 +221,8 @@ public class TunnelListFragment extends BaseFragment { @Override public boolean onCreateActionMode(final ActionMode mode, final Menu menu) { actionMode = mode; - resources = getActivity().getResources(); + if (getActivity() != null) + resources = getActivity().getResources(); tunnelList = binding.tunnelList; mode.getMenuInflater().inflate(R.menu.tunnel_list_action_mode, menu); return true; |