Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 23:29:52 +01:00
Code Issues Projects Releases Wiki Activity

[android] address last contact aliases review issues

Browse Source
This commit is contained in:
Torsten Grote
2018-11-06 14:57:39 -03:00
parent 8b709969ab
commit 6883c5caa9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java
View File

@@ -194,7 +194,6 @@ public class ConversationActivity extends BriarActivity
// Custom Toolbar // Custom Toolbar
toolbar = requireNonNull(setUpCustomToolbar(true)); toolbar = requireNonNull(setUpCustomToolbar(true));
if (toolbar == null) throw new AssertionError();
toolbarAvatar = toolbar.findViewById(R.id.contactAvatar); toolbarAvatar = toolbar.findViewById(R.id.contactAvatar);
toolbarStatus = toolbar.findViewById(R.id.contactStatus); toolbarStatus = toolbar.findViewById(R.id.contactStatus);
toolbarTitle = toolbar.findViewById(R.id.contactName); toolbarTitle = toolbar.findViewById(R.id.contactName);

5
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationViewModel.java
View File

@@ -5,7 +5,6 @@ import android.arch.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData; import android.arch.lifecycle.LiveData;
import android.arch.lifecycle.MutableLiveData; import android.arch.lifecycle.MutableLiveData;
import android.arch.lifecycle.Transformations; import android.arch.lifecycle.Transformations;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import org.briarproject.bramble.api.contact.Contact; 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.DbException;
import org.briarproject.bramble.api.db.NoSuchContactException; import org.briarproject.bramble.api.db.NoSuchContactException;
import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.AuthorId;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.android.util.UiUtils; import org.briarproject.briar.android.util.UiUtils;
import java.util.concurrent.Executor; 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.logException;
import static org.briarproject.bramble.util.LogUtils.now; import static org.briarproject.bramble.util.LogUtils.now;
@NotNullByDefault
public class ConversationViewModel extends AndroidViewModel { public class ConversationViewModel extends AndroidViewModel {
private static Logger LOG = private static Logger LOG =
@@ -49,7 +50,7 @@ public class ConversationViewModel extends AndroidViewModel {
new MutableLiveData<>(); new MutableLiveData<>();
@Inject @Inject
ConversationViewModel(@NonNull Application application, ConversationViewModel(Application application,
@DatabaseExecutor Executor dbExecutor, @DatabaseExecutor Executor dbExecutor,
ContactManager contactManager) { ContactManager contactManager) {
super(application); super(application);

4
briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java
View File

@@ -18,11 +18,11 @@ public abstract class ViewModelModule {
@IntoMap @IntoMap
@ViewModelKey(ConversationViewModel.class) @ViewModelKey(ConversationViewModel.class)
abstract ViewModel bindConversationViewModel( abstract ViewModel bindConversationViewModel(
ConversationViewModel userViewModel); ConversationViewModel conversationViewModel);
@Binds @Binds
@Singleton @Singleton
abstract ViewModelProvider.Factory bindViewModelFactory( abstract ViewModelProvider.Factory bindViewModelFactory(
ViewModelFactory factory); ViewModelFactory viewModelFactory);
} }