From 8e8643122eb5783d4412c8a81fb03cc789c3f77c Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Mon, 9 Mar 2020 12:01:52 -0600
Subject: global: get rid of nonnull gradle hack

Hacking things up via gradle is not right, and package-info.java poses
problems with two modules, so instead we just apply it manually to every
class.

Remember to add this to new classes!

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 .../java/com/wireguard/android/preference/LogExporterPreference.java   | 3 +++
 .../com/wireguard/android/preference/ModuleDownloaderPreference.java   | 3 +++
 .../com/wireguard/android/preference/ToolsInstallerPreference.java     | 3 +++
 .../main/java/com/wireguard/android/preference/VersionPreference.java  | 3 +++
 .../java/com/wireguard/android/preference/ZipExporterPreference.java   | 3 +++
 5 files changed, 15 insertions(+)

(limited to 'ui/src/main/java/com/wireguard/android/preference')

diff --git a/ui/src/main/java/com/wireguard/android/preference/LogExporterPreference.java b/ui/src/main/java/com/wireguard/android/preference/LogExporterPreference.java
index 565854b4..69608e4d 100644
--- a/ui/src/main/java/com/wireguard/android/preference/LogExporterPreference.java
+++ b/ui/src/main/java/com/wireguard/android/preference/LogExporterPreference.java
@@ -5,6 +5,8 @@
 
 package com.wireguard.android.preference;
 
+import com.wireguard.util.NonNullForAll;
+
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -29,6 +31,7 @@ import java.io.InputStreamReader;
  * Preference implementing a button that asynchronously exports logs.
  */
 
+@NonNullForAll
 public class LogExporterPreference extends Preference {
     private static final String TAG = "WireGuard/" + LogExporterPreference.class.getSimpleName();
 
diff --git a/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java b/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java
index 5c83f1dc..8858c725 100644
--- a/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java
+++ b/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.java
@@ -5,6 +5,8 @@
 
 package com.wireguard.android.preference;
 
+import com.wireguard.util.NonNullForAll;
+
 import android.content.Context;
 import android.content.Intent;
 import android.system.OsConstants;
@@ -18,6 +20,7 @@ import com.wireguard.android.util.ErrorMessages;
 import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 
+@NonNullForAll
 public class ModuleDownloaderPreference extends Preference {
     private State state = State.INITIAL;
 
diff --git a/ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java b/ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java
index 78a7497b..61752598 100644
--- a/ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java
+++ b/ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java
@@ -5,6 +5,8 @@
 
 package com.wireguard.android.preference;
 
+import com.wireguard.util.NonNullForAll;
+
 import android.content.Context;
 import androidx.annotation.Nullable;
 import androidx.preference.Preference;
@@ -19,6 +21,7 @@ import com.wireguard.android.util.ToolsInstaller;
  * result as the preference summary.
  */
 
+@NonNullForAll
 public class ToolsInstallerPreference extends Preference {
     private State state = State.INITIAL;
 
diff --git a/ui/src/main/java/com/wireguard/android/preference/VersionPreference.java b/ui/src/main/java/com/wireguard/android/preference/VersionPreference.java
index 7e95a8ae..542fe2d2 100644
--- a/ui/src/main/java/com/wireguard/android/preference/VersionPreference.java
+++ b/ui/src/main/java/com/wireguard/android/preference/VersionPreference.java
@@ -5,6 +5,8 @@
 
 package com.wireguard.android.preference;
 
+import com.wireguard.util.NonNullForAll;
+
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -22,6 +24,7 @@ import com.wireguard.android.backend.WgQuickBackend;
 
 import java.util.Locale;
 
+@NonNullForAll
 public class VersionPreference extends Preference {
     @Nullable private String versionSummary;
 
diff --git a/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java b/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java
index 3af412a5..8f86fec7 100644
--- a/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java
+++ b/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java
@@ -5,6 +5,8 @@
 
 package com.wireguard.android.preference;
 
+import com.wireguard.util.NonNullForAll;
+
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -35,6 +37,7 @@ import java9.util.concurrent.CompletableFuture;
  * Preference implementing a button that asynchronously exports config zips.
  */
 
+@NonNullForAll
 public class ZipExporterPreference extends Preference {
     private static final String TAG = "WireGuard/" + ZipExporterPreference.class.getSimpleName();
 
-- 
cgit v1.2.3-59-g8ed1b