diff options
author | Eric Kuck <eric@bluelinelabs.com> | 2018-07-12 19:10:35 -0500 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-13 03:46:23 +0200 |
commit | 67ea8b2936343526ff0b3f476c515f0e11dbb272 (patch) | |
tree | 84f904d66f6111a7d8f897164eb236bc62199cae /app/src/main/java/com/wireguard/android/preference | |
parent | Version bump (diff) | |
download | wireguard-android-67ea8b2936343526ff0b3f476c515f0e11dbb272.tar.xz wireguard-android-67ea8b2936343526ff0b3f476c515f0e11dbb272.zip |
global: Add nullity annotations
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
Diffstat (limited to 'app/src/main/java/com/wireguard/android/preference')
4 files changed, 13 insertions, 10 deletions
diff --git a/app/src/main/java/com/wireguard/android/preference/LogExporterPreference.java b/app/src/main/java/com/wireguard/android/preference/LogExporterPreference.java index f9ac9a41..a96cb9c8 100644 --- a/app/src/main/java/com/wireguard/android/preference/LogExporterPreference.java +++ b/app/src/main/java/com/wireguard/android/preference/LogExporterPreference.java @@ -10,6 +10,7 @@ import android.Manifest; import android.content.Context; import android.content.pm.PackageManager; import android.os.Environment; +import android.support.annotation.Nullable; import android.support.design.widget.Snackbar; import android.support.v7.preference.Preference; import android.util.AttributeSet; @@ -33,7 +34,7 @@ import java.io.InputStreamReader; public class LogExporterPreference extends Preference { private static final String TAG = "WireGuard/" + LogExporterPreference.class.getSimpleName(); - private String exportedFilePath; + @Nullable private String exportedFilePath; public LogExporterPreference(final Context context, final AttributeSet attrs) { super(context, attrs); @@ -73,7 +74,7 @@ public class LogExporterPreference extends Preference { }).whenComplete(this::exportLogComplete); } - private void exportLogComplete(final String filePath, final Throwable throwable) { + private void exportLogComplete(final String filePath, @Nullable final Throwable throwable) { if (throwable != null) { final String error = ExceptionLoggers.unwrapMessage(throwable); final String message = getContext().getString(R.string.log_export_error, error); diff --git a/app/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java b/app/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java index 44599edc..4006d0e8 100644 --- a/app/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java +++ b/app/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java @@ -7,7 +7,7 @@ package com.wireguard.android.preference; import android.content.Context; -import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.v7.preference.Preference; import android.util.AttributeSet; @@ -43,7 +43,7 @@ public class ToolsInstallerPreference extends Preference { Application.getAsyncWorker().supplyAsync(Application.getToolsInstaller()::areInstalled).whenComplete(this::onCheckResult); } - private void onCheckResult(final int state, final Throwable throwable) { + private void onCheckResult(final int state, @Nullable final Throwable throwable) { if (throwable != null || state == ToolsInstaller.ERROR) setState(State.INITIAL); else if ((state & ToolsInstaller.YES) == ToolsInstaller.YES) @@ -62,7 +62,7 @@ public class ToolsInstallerPreference extends Preference { Application.getAsyncWorker().supplyAsync(Application.getToolsInstaller()::install).whenComplete(this::onInstallResult); } - private void onInstallResult(final Integer result, final Throwable throwable) { + private void onInstallResult(final Integer result, @Nullable final Throwable throwable) { if (throwable != null) setState(State.FAILURE); else if ((result & (ToolsInstaller.YES | ToolsInstaller.MAGISK)) == (ToolsInstaller.YES | ToolsInstaller.MAGISK)) @@ -73,7 +73,7 @@ public class ToolsInstallerPreference extends Preference { setState(State.FAILURE); } - private void setState(@NonNull final State state) { + private void setState(final State state) { if (this.state == state) return; this.state = state; diff --git a/app/src/main/java/com/wireguard/android/preference/VersionPreference.java b/app/src/main/java/com/wireguard/android/preference/VersionPreference.java index de34047d..525396bc 100644 --- a/app/src/main/java/com/wireguard/android/preference/VersionPreference.java +++ b/app/src/main/java/com/wireguard/android/preference/VersionPreference.java @@ -9,6 +9,7 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.net.Uri; +import android.support.annotation.Nullable; import android.support.v7.preference.Preference; import android.util.AttributeSet; @@ -17,7 +18,7 @@ import com.wireguard.android.BuildConfig; import com.wireguard.android.R; public class VersionPreference extends Preference { - private String versionSummary; + @Nullable private String versionSummary; public VersionPreference(final Context context, final AttributeSet attrs) { super(context, attrs); @@ -33,7 +34,7 @@ public class VersionPreference extends Preference { }); } - @Override + @Override @Nullable public CharSequence getSummary() { return versionSummary; } diff --git a/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java b/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java index 16094007..a1477214 100644 --- a/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java +++ b/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java @@ -10,6 +10,7 @@ import android.Manifest; import android.content.Context; import android.content.pm.PackageManager; import android.os.Environment; +import android.support.annotation.Nullable; import android.support.design.widget.Snackbar; import android.support.v7.preference.Preference; import android.util.AttributeSet; @@ -40,7 +41,7 @@ import java9.util.concurrent.CompletableFuture; public class ZipExporterPreference extends Preference { private static final String TAG = "WireGuard/" + ZipExporterPreference.class.getSimpleName(); - private String exportedFilePath; + @Nullable private String exportedFilePath; public ZipExporterPreference(final Context context, final AttributeSet attrs) { super(context, attrs); @@ -79,7 +80,7 @@ public class ZipExporterPreference extends Preference { }).whenComplete(this::exportZipComplete)); } - private void exportZipComplete(final String filePath, final Throwable throwable) { + private void exportZipComplete(@Nullable final String filePath, @Nullable final Throwable throwable) { if (throwable != null) { final String error = ExceptionLoggers.unwrapMessage(throwable); final String message = getContext().getString(R.string.zip_export_error, error); |