Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update libsignal-client to 0.14.0

Browse Source
This commit is contained in:
Greyson Parrelli
2022-03-14 15:49:46 -04:00
committed by Cody Henthorne
parent 749bbf428d
commit 057231b9c3
650 changed files with 2154 additions and 2384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageRepository.java
View File

@@ -13,9 +13,9 @@ import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobs.MultiDeviceViewedUpdateJob;
import org.thoughtcrime.securesms.jobs.SendViewedReceiptJob;
import org.whispersystems.libsignal.util.guava.Optional;
import java.util.Collections;
import java.util.Optional;
class ViewOnceMessageRepository {
@@ -41,9 +41,9 @@ class ViewOnceMessageRepository {
MultiDeviceViewedUpdateJob.enqueue(Collections.singletonList(info.getSyncMessageId()));
}
callback.onComplete(Optional.fromNullable(record));
callback.onComplete(Optional.ofNullable(record));
} catch (NoSuchMessageException e) {
callback.onComplete(Optional.absent());
callback.onComplete(Optional.empty());
}
});
}

5
app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageView.java
View File

@@ -1,13 +1,10 @@
package org.thoughtcrime.securesms.revealable;
import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -15,8 +12,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.core.content.ContextCompat;
import androidx.core.widget.ImageViewCompat;
import com.pnikosis.materialishprogress.ProgressWheel;

10
app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageViewModel.java
View File

@@ -1,7 +1,5 @@
package org.thoughtcrime.securesms.revealable;
import android.app.Application;
import androidx.annotation.NonNull;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
@@ -13,7 +11,9 @@ import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.DatabaseObserver;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.whispersystems.libsignal.util.guava.Optional;
import java.util.Optional;
class ViewOnceMessageViewModel extends ViewModel {
@@ -46,8 +46,8 @@ class ViewOnceMessageViewModel extends ViewModel {
private void onMessageRetrieved(@NonNull Optional<MmsMessageRecord> optionalMessage) {
ThreadUtil.runOnMain(() -> {
MmsMessageRecord current = message.getValue() != null ? message.getValue().orNull() : null;
MmsMessageRecord proposed = optionalMessage.orNull();
MmsMessageRecord current = message.getValue() != null ? message.getValue().orElse(null) : null;
MmsMessageRecord proposed = optionalMessage.orElse(null);
if (current != null && proposed != null && current.getId() == proposed.getId()) {
Log.d(TAG, "Same ID -- skipping update");