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

Quick cleanup across the board

Browse Source 
- 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>
This commit is contained in:
Harsh Shandilya
2018-04-28 06:07:48 +02:00
committed by Jason A. Donenfeld
parent 592c5cbbd6
commit ba862b166b
8 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.wireguard.android.fragment;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -33,7 +34,7 @@ public class TunnelDetailFragment 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 = TunnelDetailFragmentBinding.inflate(inflater, container, false);
app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
+4 -2
View File
@@ -5,6 +5,7 @@ import android.content.Context;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -101,7 +102,7 @@ public class TunnelEditorFragment 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 = TunnelEditorFragmentBinding.inflate(inflater, container, false);
@@ -118,6 +119,7 @@ public class TunnelEditorFragment extends BaseFragment {
private void onFinished() {
// Hide the keyboard; it rarely goes away on its own.
final Activity activity = getActivity();
if (activity == null) return;
final View focusedView = activity.getCurrentFocus();
if (focusedView != null) {
final Object service = activity.getSystemService(Context.INPUT_METHOD_SERVICE);
@@ -174,7 +176,7 @@ public class TunnelEditorFragment extends BaseFragment {
}
@Override
public void onSaveInstanceState(final Bundle outState) {
public void onSaveInstanceState(@NonNull final Bundle outState) {
outState.putParcelable(KEY_LOCAL_CONFIG, localConfig);
outState.putString(KEY_ORIGINAL_NAME, originalName);
super.onSaveInstanceState(outState);
app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
+4 -2
View File
@@ -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;