Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 22:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Group together fields with the same access restrictions.

Browse Source
This commit is contained in:
akwizgran
2019-01-14 14:25:32 +00:00
parent 232c2129a7
commit 20c51c1aa4
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
View File

@@ -152,21 +152,8 @@ public class ConversationActivity extends BriarActivity
@Inject @Inject
@CryptoExecutor @CryptoExecutor
Executor cryptoExecutor; Executor cryptoExecutor;
@Inject
private final Map<MessageId, String> textCache = new ConcurrentHashMap<>(); ViewModelProvider.Factory viewModelFactory;
private AttachmentController attachmentController;
private ConversationViewModel viewModel;
private ConversationVisitor visitor;
private ConversationAdapter adapter;
private Toolbar toolbar;
private CircleImageView toolbarAvatar;
private ImageView toolbarStatus;
private TextView toolbarTitle;
private BriarRecyclerView list;
private LinearLayoutManager layoutManager;
private TextInputView textInputView;
private TextSendController sendController;
// Fields that are accessed from background threads must be volatile // Fields that are accessed from background threads must be volatile
@Inject @Inject
@@ -189,20 +176,32 @@ public class ConversationActivity extends BriarActivity
volatile BlogSharingManager blogSharingManager; volatile BlogSharingManager blogSharingManager;
@Inject @Inject
volatile GroupInvitationManager groupInvitationManager; volatile GroupInvitationManager groupInvitationManager;
@Inject
ViewModelProvider.Factory viewModelFactory;
private volatile ContactId contactId; private final Map<MessageId, String> textCache = new ConcurrentHashMap<>();
@Nullable
private Parcelable layoutManagerState;
private final MutableLiveData<Boolean> canShowOnboarding = private final MutableLiveData<Boolean> canShowOnboarding =
new MutableLiveData<>(); new MutableLiveData<>();
private final Observer<String> contactNameObserver = name -> { private final Observer<String> contactNameObserver = name -> {
requireNonNull(name); requireNonNull(name);
loadMessages(); loadMessages();
}; };
private AttachmentController attachmentController;
private ConversationViewModel viewModel;
private ConversationVisitor visitor;
private ConversationAdapter adapter;
private Toolbar toolbar;
private CircleImageView toolbarAvatar;
private ImageView toolbarStatus;
private TextView toolbarTitle;
private BriarRecyclerView list;
private LinearLayoutManager layoutManager;
private TextInputView textInputView;
private TextSendController sendController;
@Nullable
private Parcelable layoutManagerState;
private volatile ContactId contactId;
@Override @Override
public void onCreate(@Nullable Bundle state) { public void onCreate(@Nullable Bundle state) {
if (SDK_INT >= 21) { if (SDK_INT >= 21) {