mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-27 12:15:50 +01:00
Rewrite the AppDependencies system.
This commit is contained in:
committed by
Cody Henthorne
parent
a0131bf39b
commit
b6a4e1f145
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms
|
||||
|
||||
import org.signal.spinner.Plugin
|
||||
import org.signal.spinner.PluginResult
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
|
||||
import org.thoughtcrime.securesms.dependencies.AppDependencies
|
||||
import org.thoughtcrime.securesms.keyvalue.SignalStore
|
||||
|
||||
class StorageServicePlugin : Plugin {
|
||||
@@ -13,7 +13,7 @@ class StorageServicePlugin : Plugin {
|
||||
val columns = listOf("Type", "Data")
|
||||
val rows = mutableListOf<List<String>>()
|
||||
|
||||
val manager = ApplicationDependencies.getSignalServiceAccountManager()
|
||||
val manager = AppDependencies.signalServiceAccountManager
|
||||
val storageServiceKey = SignalStore.storageService().orCreateStorageKey
|
||||
val storageManifestVersion = manager.storageManifestVersion
|
||||
val manifest = manager.getStorageManifestIfDifferentVersion(storageServiceKey, storageManifestVersion - 1).get()
|
||||
|
||||
@@ -9,7 +9,7 @@ import org.signal.spinner.DefaultColumnTransformer
|
||||
import org.thoughtcrime.securesms.database.model.MessageRecord
|
||||
import org.thoughtcrime.securesms.database.model.UpdateDescription
|
||||
import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
|
||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
|
||||
import org.thoughtcrime.securesms.dependencies.AppDependencies
|
||||
|
||||
object GV2UpdateTransformer : ColumnTransformer {
|
||||
override fun matches(tableName: String?, columnName: String): Boolean {
|
||||
@@ -28,7 +28,7 @@ object GV2UpdateTransformer : ColumnTransformer {
|
||||
return if (MessageTypes.isGroupV2(type) && MessageTypes.isGroupUpdate(type) && body != null) {
|
||||
val decoded = Base64.decode(body)
|
||||
val decryptedGroupV2Context = DecryptedGroupV2Context.ADAPTER.decode(decoded)
|
||||
val gv2ChangeDescription: UpdateDescription = MessageRecord.getGv2ChangeDescription(ApplicationDependencies.getApplication(), body, null)
|
||||
val gv2ChangeDescription: UpdateDescription = MessageRecord.getGv2ChangeDescription(AppDependencies.application, body, null)
|
||||
|
||||
"${gv2ChangeDescription.spannable}<br><br>${decryptedGroupV2Context.change}"
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user