Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 10:20:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix several conversation fragment issues.

Browse Source
This commit is contained in:
Alex Hart
2022-07-22 12:50:40 -03:00
committed by Cody Henthorne
parent 837f86bdd3
commit c8612d5502
4 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View File

@@ -815,8 +815,9 @@ public class ConversationParentFragment extends Fragment
private void onInitialSecurityConfigurationLoaded() {
Log.d(TAG, "Initial security configuration loaded.");
if (isDetached()) {
Log.w(TAG, "Fragment has become detached. Ignoring configuration call.");
if (getContext() == null) {
Log.w(TAG, "Fragment has become detached from context. Ignoring configuration call.");
return;
}
initializeProfiles();
@@ -826,6 +827,12 @@ public class ConversationParentFragment extends Fragment
initializeDraft(viewModel.getArgs()).addListener(new AssertedSuccessListener<Boolean>() {
@Override
public void onSuccess(Boolean loadedDraft) {
Log.d(TAG, "Initial security configuration loaded.");
if (getContext() == null) {
Log.w(TAG, "Fragment has become detached from context. Ignoring draft load.");
return;
}
if (loadedDraft != null && loadedDraft) {
Log.i(TAG, "Finished loading draft");
ThreadUtil.runOnMain(() -> {
@@ -837,7 +844,7 @@ public class ConversationParentFragment extends Fragment
});
}
if (TextSecurePreferences.isTypingIndicatorsEnabled(requireContext())) {
if (TextSecurePreferences.isTypingIndicatorsEnabled(ApplicationDependencies.getApplication())) {
composeText.addTextChangedListener(typingTextWatcher);
}
composeText.setSelection(composeText.length(), composeText.length());

30
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java
View File

@@ -133,8 +133,22 @@ class ConversationRepository {
return Single.fromCallable(() -> Util.isMmsCapable(context)).subscribeOn(Schedulers.io());
}
@NonNull Observable<ConversationSecurityInfo> getSecurityInfo(RecipientId recipientId) {
return Recipient.observable(recipientId).map(recipient -> {
/**
* Watchest the given recipient id for changes, and gets the security info for the recipient
* whenever a change occurs.
*
* @param recipientId The recipient id we are interested in
*
* @return The recipient's security info.
*/
@NonNull Observable<ConversationSecurityInfo> getSecurityInfo(@NonNull RecipientId recipientId) {
return Recipient.observable(recipientId)
.switchMapSingle(this::getSecurityInfo)
.subscribeOn(Schedulers.io());
}
private @NonNull Single<ConversationSecurityInfo> getSecurityInfo(@NonNull Recipient recipient) {
return Single.fromCallable(() -> {
Log.i(TAG, "Resolving registered state...");
RecipientDatabase.RegisteredState registeredState;
@@ -159,22 +173,22 @@ class ConversationRepository {
}
Log.i(TAG, "Returning registered state...");
return new ConversationSecurityInfo(recipientId,
return new ConversationSecurityInfo(recipient.getId(),
registeredState == RecipientDatabase.RegisteredState.REGISTERED && signalEnabled,
Util.isDefaultSmsProvider(context),
true);
}).subscribeOn(Schedulers.io());
});
}
Observable<ThreadRecord> getThreadRecord(long threadId) {
Observable<Optional<ThreadRecord>> getThreadRecord(long threadId) {
if (threadId == -1L) {
return Observable.empty();
return Observable.just(Optional.empty());
}
return Observable.<ThreadRecord>create(emitter -> {
return Observable.<Optional<ThreadRecord>> create(emitter -> {
DatabaseObserver.Observer listener = () -> {
emitter.onNext(SignalDatabase.threads().getThreadRecord(threadId));
emitter.onNext(Optional.ofNullable(SignalDatabase.threads().getThreadRecord(threadId)));
};
ApplicationDependencies.getDatabaseObserver().registerConversationObserver(threadId, listener);

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationViewModel.java
View File

@@ -139,7 +139,7 @@ public class ConversationViewModel extends ViewModel {
disposables.add(threadCountStore.update(
threadId.switchMap(conversationRepository::getThreadRecord).toFlowable(BackpressureStrategy.BUFFER),
(record, count) -> count.updateWith(record)
(record, count) -> record.map(count::updateWith).orElse(count)
));
conversationStateStore.update(Observable.combineLatest(recipientId, conversationStateTick, (id, tick) -> id)

5
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
View File

@@ -688,7 +688,10 @@ public class ConversationListFragment extends MainFragment implements ActionMode
AppStartup.getInstance().onCriticalRenderEventEnd();
startupStopwatch.split("first-render");
startupStopwatch.stop(TAG);
ConversationFragment.prepare(requireContext());
if (getContext() != null) {
ConversationFragment.prepare(getContext());
}
});
}
});