Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-27 05:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update AGP to 8.0

Browse Source 
Co-authored-by: Greyson Parrelli <greyson@signal.org>
This commit is contained in:
Cody Henthorne
2023-06-20 14:49:00 -04:00
committed by Nicholas Tinsley
parent ed4a1d6ddd
commit 53673be5cb
29 changed files with 643 additions and 1768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsRepository.kt
View File

@@ -5,17 +5,15 @@
package org.thoughtcrime.securesms.calls.links.details
import io.reactivex.rxjava3.core.Maybe
import io.reactivex.rxjava3.core.Observable
import io.reactivex.rxjava3.disposables.Disposable
import io.reactivex.rxjava3.kotlin.subscribeBy
import io.reactivex.rxjava3.schedulers.Schedulers
import org.signal.core.util.concurrent.MaybeCompat
import org.signal.core.util.orNull
import org.thoughtcrime.securesms.database.CallLinkTable
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
import org.thoughtcrime.securesms.service.webrtc.links.ReadCallLinkResult
import org.thoughtcrime.securesms.service.webrtc.links.SignalCallLinkManager
@@ -24,7 +22,7 @@ class CallLinkDetailsRepository(
private val callLinkManager: SignalCallLinkManager = ApplicationDependencies.getSignalCallManager().callLinkManager
) {
fun refreshCallLinkState(callLinkRoomId: CallLinkRoomId): Disposable {
return Maybe.fromCallable<CallLinkTable.CallLink> { SignalDatabase.callLinks.getCallLinkByRoomId(callLinkRoomId) }
return MaybeCompat.fromCallable { SignalDatabase.callLinks.getCallLinkByRoomId(callLinkRoomId) }
.flatMapSingle { callLinkManager.readCallLink(it.credentials!!) }
.subscribeOn(Schedulers.io())
.subscribeBy { result ->
@@ -36,7 +34,7 @@ class CallLinkDetailsRepository(
}
fun watchCallLinkRecipient(callLinkRoomId: CallLinkRoomId): Observable<Recipient> {
return Maybe.fromCallable<RecipientId> { SignalDatabase.recipients.getByCallLinkRoomId(callLinkRoomId).orNull() }
return MaybeCompat.fromCallable { SignalDatabase.recipients.getByCallLinkRoomId(callLinkRoomId).orNull() }
.flatMapObservable { Recipient.observable(it) }
.distinctUntilChanged { a, b -> a.hasSameContent(b) }
.subscribeOn(Schedulers.io())

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailRepository.kt
View File

@@ -24,7 +24,7 @@ class DonationReceiptDetailRepository {
fun getDonationReceiptRecord(id: Long): Single<DonationReceiptRecord> {
return Single.fromCallable<DonationReceiptRecord> {
SignalDatabase.donationReceipts.getReceipt(id)
SignalDatabase.donationReceipts.getReceipt(id)!!
}.subscribeOn(Schedulers.io())
}
}

12
app/src/main/java/org/thoughtcrime/securesms/conversation/colors/NameColors.kt
View File

@@ -45,11 +45,13 @@ object NameColors {
}
private fun getSessionGroupRecipients(groupId: GroupId, sessionMemberCache: MutableMap<GroupId, Set<Recipient>>): LiveData<Set<Recipient>> {
val fullMembers = LiveGroup(groupId).fullMembers.map { members: List<FullMember>? ->
Stream.of(members)
.map { it.member }
.toList()
}
val fullMembers = LiveGroup(groupId)
.fullMembers
.map { members: List<FullMember>? ->
Stream.of(members)
.map { it.member }
.toList()
}
return fullMembers.map { currentMembership: List<Recipient>? ->
val cachedMembers: MutableSet<Recipient> = MapUtil.getOrDefault(sessionMemberCache, groupId, HashSet()).toMutableSet()

7
app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftRepository.kt
View File

@@ -12,6 +12,7 @@ import io.reactivex.rxjava3.core.Maybe
import io.reactivex.rxjava3.core.Single
import io.reactivex.rxjava3.schedulers.Schedulers
import org.signal.core.util.StreamUtil
import org.signal.core.util.concurrent.MaybeCompat
import org.signal.core.util.concurrent.SignalExecutors
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.components.location.SignalPlace
@@ -70,7 +71,7 @@ class DraftRepository(
}
fun getShareOrDraftData(): Maybe<Pair<ShareOrDraftData, Drafts?>> {
return Maybe.fromCallable<Pair<ShareOrDraftData, Drafts?>> { getShareOrDraftDataInternal() }
return MaybeCompat.fromCallable { getShareOrDraftDataInternal() }
.observeOn(Schedulers.io())
}
@@ -214,7 +215,7 @@ class DraftRepository(
@Deprecated("Not needed for CFv2")
fun loadDraftQuote(serialized: String): Maybe<ConversationMessage> {
return Maybe.fromCallable { loadDraftQuoteInternal(serialized) }
return MaybeCompat.fromCallable { loadDraftQuoteInternal(serialized) }
}
private fun loadDraftQuoteInternal(serialized: String): ConversationMessage? {
@@ -233,7 +234,7 @@ class DraftRepository(
@Deprecated("Not needed for CFv2")
fun loadDraftMessageEdit(serialized: String): Maybe<ConversationMessage> {
return Maybe.fromCallable { loadDraftMessageEditInternal(serialized) }
return MaybeCompat.fromCallable { loadDraftMessageEditInternal(serialized) }
}
private fun loadDraftMessageEditInternal(serialized: String): ConversationMessage? {

3
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt
View File

@@ -23,6 +23,7 @@ import io.reactivex.rxjava3.core.Single
import io.reactivex.rxjava3.core.SingleEmitter
import io.reactivex.rxjava3.schedulers.Schedulers
import org.signal.core.util.StreamUtil
import org.signal.core.util.concurrent.MaybeCompat
import org.signal.core.util.concurrent.SignalExecutors
import org.signal.core.util.dp
import org.signal.core.util.logging.Log
@@ -376,7 +377,7 @@ class ConversationRepository(
}
fun getTemporaryViewOnceUri(mmsMessageRecord: MmsMessageRecord): Maybe<Uri> {
return Maybe.fromCallable<Uri> {
return MaybeCompat.fromCallable {
Log.i(TAG, "Copying the view-once photo to temp storage and deleting underlying media.")
try {

2
app/src/main/java/org/thoughtcrime/securesms/stories/settings/privacy/ChooseInitialMyStoryMembershipViewModel.kt
View File

@@ -50,7 +50,7 @@ class ChooseInitialMyStoryMembershipViewModel @JvmOverloads constructor(
return Single.fromCallable<RecipientId> {
SignalStore.storyValues().userHasBeenNotifiedAboutStories = true
Stories.onStorySettingsChanged(Recipient.self().id)
store.state.recipientId
store.state.recipientId!!
}.observeOn(AndroidSchedulers.mainThread())
}
}