From 8e8643122eb5783d4412c8a81fb03cc789c3f77c Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" 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 --- .../main/java/com/wireguard/android/databinding/BindingAdapters.java | 3 +++ .../java/com/wireguard/android/databinding/ItemChangeListener.java | 3 +++ .../android/databinding/ObservableKeyedRecyclerViewAdapter.java | 3 +++ 3 files changed, 9 insertions(+) (limited to 'ui/src/main/java/com/wireguard/android/databinding') diff --git a/ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.java b/ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.java index ee216d4c..616f665d 100644 --- a/ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.java +++ b/ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.java @@ -5,6 +5,8 @@ package com.wireguard.android.databinding; +import com.wireguard.util.NonNullForAll; + import androidx.databinding.BindingAdapter; import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableList; @@ -35,6 +37,7 @@ import java9.util.Optional; */ @SuppressWarnings("unused") +@NonNullForAll public final class BindingAdapters { private BindingAdapters() { // Prevent instantiation. diff --git a/ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java b/ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java index e7303eae..284f73b4 100644 --- a/ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java +++ b/ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java @@ -5,6 +5,8 @@ package com.wireguard.android.databinding; +import com.wireguard.util.NonNullForAll; + import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableList; import androidx.databinding.ViewDataBinding; @@ -22,6 +24,7 @@ import java.util.Objects; * Helper class for binding an ObservableList to the children of a ViewGroup. */ +@NonNullForAll class ItemChangeListener { private final OnListChangedCallback callback = new OnListChangedCallback<>(this); private final ViewGroup container; diff --git a/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.java b/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.java index 8b40dd91..36d1917a 100644 --- a/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.java +++ b/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.java @@ -5,6 +5,8 @@ package com.wireguard.android.databinding; +import com.wireguard.util.NonNullForAll; + import android.content.Context; import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableList; @@ -25,6 +27,7 @@ import java.lang.ref.WeakReference; * A generic {@code RecyclerView.Adapter} backed by a {@code ObservableKeyedList}. */ +@NonNullForAll public class ObservableKeyedRecyclerViewAdapter> extends Adapter { private final OnListChangedCallback callback = new OnListChangedCallback<>(this); -- cgit v1.2.3-59-g8ed1b