diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-03-09 12:01:52 -0600 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-03-09 12:19:15 -0600 |
commit | 8e8643122eb5783d4412c8a81fb03cc789c3f77c (patch) | |
tree | 43cc7ea98c33115a7b3bc062104deeb75c580f19 /ui/src/main/java/com/wireguard/android/widget | |
parent | Application: simplify static block (diff) | |
download | wireguard-android-8e8643122eb5783d4412c8a81fb03cc789c3f77c.tar.xz wireguard-android-8e8643122eb5783d4412c8a81fb03cc789c3f77c.zip |
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>
Diffstat (limited to 'ui/src/main/java/com/wireguard/android/widget')
5 files changed, 15 insertions, 0 deletions
diff --git a/ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.java b/ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.java index 79572aa3..c91b12ff 100644 --- a/ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.java +++ b/ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.java @@ -5,6 +5,8 @@ package com.wireguard.android.widget; +import com.wireguard.util.NonNullForAll; + import androidx.annotation.Nullable; import android.text.InputFilter; import android.text.SpannableStringBuilder; @@ -16,6 +18,7 @@ import com.wireguard.crypto.Key; * InputFilter for entering WireGuard private/public keys encoded with base64. */ +@NonNullForAll public class KeyInputFilter implements InputFilter { private static boolean isAllowed(final char c) { return Character.isLetterOrDigit(c) || c == '+' || c == '/'; diff --git a/ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.java b/ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.java index 2fe9c924..16742ae8 100644 --- a/ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.java +++ b/ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.java @@ -5,12 +5,15 @@ package com.wireguard.android.widget; +import com.wireguard.util.NonNullForAll; + import android.content.Context; import android.util.AttributeSet; import android.widget.RelativeLayout; import com.wireguard.android.R; +@NonNullForAll public class MultiselectableRelativeLayout extends RelativeLayout { private static final int[] STATE_MULTISELECTED = {R.attr.state_multiselected}; private boolean multiselected; diff --git a/ui/src/main/java/com/wireguard/android/widget/NameInputFilter.java b/ui/src/main/java/com/wireguard/android/widget/NameInputFilter.java index 030be25a..1ec14ac0 100644 --- a/ui/src/main/java/com/wireguard/android/widget/NameInputFilter.java +++ b/ui/src/main/java/com/wireguard/android/widget/NameInputFilter.java @@ -5,6 +5,8 @@ package com.wireguard.android.widget; +import com.wireguard.util.NonNullForAll; + import androidx.annotation.Nullable; import android.text.InputFilter; import android.text.SpannableStringBuilder; @@ -16,6 +18,7 @@ import com.wireguard.android.backend.Tunnel; * InputFilter for entering WireGuard configuration names (Linux interface names). */ +@NonNullForAll public class NameInputFilter implements InputFilter { private static boolean isAllowed(final char c) { return Character.isLetterOrDigit(c) || "_=+.-".indexOf(c) >= 0; diff --git a/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.java b/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.java index e020aa81..4a3142ea 100644 --- a/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.java +++ b/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.java @@ -6,6 +6,8 @@ package com.wireguard.android.widget; +import com.wireguard.util.NonNullForAll; + import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.content.res.ColorStateList; @@ -29,6 +31,7 @@ import androidx.annotation.RequiresApi; import android.util.FloatProperty; @RequiresApi(Build.VERSION_CODES.N) +@NonNullForAll public class SlashDrawable extends Drawable { private static final float CENTER_X = 10.65f; diff --git a/ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.java b/ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.java index dcb9aceb..3aec3329 100644 --- a/ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.java +++ b/ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.java @@ -6,12 +6,15 @@ package com.wireguard.android.widget; +import com.wireguard.util.NonNullForAll; + import android.content.Context; import android.os.Parcelable; import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.Switch; +@NonNullForAll public class ToggleSwitch extends Switch { private boolean isRestoringState; @Nullable private OnBeforeCheckedChangeListener listener; |