Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 05:09:53 +01:00
Code Issues Projects Releases Wiki Activity

Require observed data to be non-null.

Browse Source
This commit is contained in:
akwizgran
2018-11-01 17:30:26 +00:00
committed by Torsten Grote
parent 12a1cf8f8b
commit d14d93ea35
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,6 +94,7 @@ import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.PromptSt
import static android.support.v4.view.ViewCompat.setTransitionName; import static android.support.v4.view.ViewCompat.setTransitionName;
import static android.support.v7.util.SortedList.INVALID_POSITION; import static android.support.v7.util.SortedList.INVALID_POSITION;
import static android.widget.Toast.LENGTH_SHORT; import static android.widget.Toast.LENGTH_SHORT;
import static java.util.Objects.requireNonNull;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logDuration;
@@ -169,7 +170,6 @@ public class ConversationActivity extends BriarActivity
@Nullable @Nullable
private volatile GroupId messagingGroupId; private volatile GroupId messagingGroupId;
@SuppressWarnings("ConstantConditions")
@Override @Override
public void onCreate(@Nullable Bundle state) { public void onCreate(@Nullable Bundle state) {
setSceneTransitionAnimation(); setSceneTransitionAnimation();
@@ -193,13 +193,16 @@ public class ConversationActivity extends BriarActivity
toolbarTitle = toolbar.findViewById(R.id.contactName); toolbarTitle = toolbar.findViewById(R.id.contactName);
observeOnce(viewModel.getContactAuthorId(), this, authorId -> { observeOnce(viewModel.getContactAuthorId(), this, authorId -> {
requireNonNull(authorId);
toolbarAvatar.setImageDrawable( toolbarAvatar.setImageDrawable(
new IdenticonDrawable(authorId.getBytes())); new IdenticonDrawable(authorId.getBytes()));
}); });
viewModel.getContactDisplayName().observe(this, contactName -> { viewModel.getContactDisplayName().observe(this, contactName -> {
requireNonNull(contactName);
toolbarTitle.setText(contactName); toolbarTitle.setText(contactName);
}); });
viewModel.isContactDeleted().observe(this, deleted -> { viewModel.isContactDeleted().observe(this, deleted -> {
requireNonNull(deleted);
if (deleted) finish(); if (deleted) finish();
}); });
viewModel.loadContact(contactId); viewModel.loadContact(contactId);