From 6883c5caa9a4a4408ac2af561c3936cb61687d6b Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 6 Nov 2018 14:57:39 -0300 Subject: [PATCH] [android] address last contact aliases review issues --- .../briar/android/contact/ConversationActivity.java | 1 - .../briar/android/contact/ConversationViewModel.java | 5 +++-- .../briar/android/viewmodel/ViewModelModule.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java index 4a0cf5eb8..9f2a80bfe 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java @@ -194,7 +194,6 @@ public class ConversationActivity extends BriarActivity // Custom Toolbar toolbar = requireNonNull(setUpCustomToolbar(true)); - if (toolbar == null) throw new AssertionError(); toolbarAvatar = toolbar.findViewById(R.id.contactAvatar); toolbarStatus = toolbar.findViewById(R.id.contactStatus); toolbarTitle = toolbar.findViewById(R.id.contactName); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationViewModel.java index 0c73cc220..95fd3a45b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationViewModel.java @@ -5,7 +5,6 @@ import android.arch.lifecycle.AndroidViewModel; import android.arch.lifecycle.LiveData; import android.arch.lifecycle.MutableLiveData; import android.arch.lifecycle.Transformations; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import org.briarproject.bramble.api.contact.Contact; @@ -15,6 +14,7 @@ import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.NoSuchContactException; import org.briarproject.bramble.api.identity.AuthorId; +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.android.util.UiUtils; import java.util.concurrent.Executor; @@ -29,6 +29,7 @@ import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.now; +@NotNullByDefault public class ConversationViewModel extends AndroidViewModel { private static Logger LOG = @@ -49,7 +50,7 @@ public class ConversationViewModel extends AndroidViewModel { new MutableLiveData<>(); @Inject - ConversationViewModel(@NonNull Application application, + ConversationViewModel(Application application, @DatabaseExecutor Executor dbExecutor, ContactManager contactManager) { super(application); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java index 0bd6e6aab..15edbed90 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java @@ -18,11 +18,11 @@ public abstract class ViewModelModule { @IntoMap @ViewModelKey(ConversationViewModel.class) abstract ViewModel bindConversationViewModel( - ConversationViewModel userViewModel); + ConversationViewModel conversationViewModel); @Binds @Singleton abstract ViewModelProvider.Factory bindViewModelFactory( - ViewModelFactory factory); + ViewModelFactory viewModelFactory); }