Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +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

1
app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessage.java
View File

@@ -1,7 +1,6 @@
package org.thoughtcrime.securesms.longmessage;
import android.content.Context;
import android.text.TextUtils;
import androidx.annotation.NonNull;

10
app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java
View File

@@ -19,10 +19,10 @@ import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
import org.thoughtcrime.securesms.mms.PartAuthority;
import org.thoughtcrime.securesms.mms.TextSlide;
import org.whispersystems.libsignal.util.guava.Optional;
import java.io.IOException;
import java.io.InputStream;
import java.util.Optional;
class LongMessageRepository {
@@ -59,7 +59,7 @@ class LongMessageRepository {
return Optional.of(new LongMessage(ConversationMessageFactory.createWithUnresolvedData(context, record.get())));
}
} else {
return Optional.absent();
return Optional.empty();
}
}
@@ -70,7 +70,7 @@ class LongMessageRepository {
if (record.isPresent()) {
return Optional.of(new LongMessage(ConversationMessageFactory.createWithUnresolvedData(context, record.get())));
} else {
return Optional.absent();
return Optional.empty();
}
}
@@ -78,14 +78,14 @@ class LongMessageRepository {
@WorkerThread
private Optional<MmsMessageRecord> getMmsMessage(@NonNull MessageDatabase mmsDatabase, long messageId) {
try (Cursor cursor = mmsDatabase.getMessageCursor(messageId)) {
return Optional.fromNullable((MmsMessageRecord) MmsDatabase.readerFor(cursor).getNext());
return Optional.ofNullable((MmsMessageRecord) MmsDatabase.readerFor(cursor).getNext());
}
}
@WorkerThread
private Optional<MessageRecord> getSmsMessage(@NonNull MessageDatabase smsDatabase, long messageId) {
try (Cursor cursor = smsDatabase.getMessageCursor(messageId)) {
return Optional.fromNullable(SmsDatabase.readerFor(cursor).getNext());
return Optional.ofNullable(SmsDatabase.readerFor(cursor).getNext());
}
}

4
app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
View File

@@ -10,7 +10,9 @@ import androidx.lifecycle.ViewModelProvider;
import org.thoughtcrime.securesms.database.DatabaseObserver;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.whispersystems.libsignal.util.guava.Optional;
import java.util.Optional;
class LongMessageViewModel extends ViewModel {