mirrors/TM-SGNL-Android
1
0
Fork 0
mirror of https://github.com/micahflee/TM-SGNL-Android.git synced 2025-08-04 19:08:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

MOD - move recorder file to filer and delete call link recorded file if present

Browse source
This commit is contained in:
TELEMESSAGE\Davidt 2024-02-14 07:58:10 +02:00
parent 7360634b96
commit 746b6fcd8b
7 changed files with 42 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/libs/androidcopysdk-signal-debug.aar
View file

Binary file not shown.

BIN
app/libs/androidcopysdk-signal-release.aar
View file

Binary file not shown.

14
app/src/tm/java/org/archiver/converter/SignalArchiveMessageConverter.kt
View file

@ -27,18 +27,18 @@ class SignalArchiveMessageConverter(
}
fun convert(message: MessageRecord?, accountPhoneNumber: String?, isDeleted: Boolean = false): ArchiveMessage? {
return convert(message, accountPhoneNumber, isDeleted, null, false)
return convert(message, accountPhoneNumber, isDeleted, null)
}
fun convertCall(message: MessageRecord?, accountPhoneNumber: String?, startedAt: Long?, isAdHocCall: Boolean): ArchiveMessage? {
return convert(message, accountPhoneNumber, false, startedAt, isAdHocCall)
fun convertCall(message: MessageRecord?, accountPhoneNumber: String?, startedAt: Long?): ArchiveMessage? {
return convert(message, accountPhoneNumber, false, startedAt)
}
private fun convert(message: MessageRecord?, accountPhoneNumber: String?, isDeleted: Boolean, startedAt: Long?, isAdHocCall: Boolean): ArchiveMessage? {
private fun convert(message: MessageRecord?, accountPhoneNumber: String?, isDeleted: Boolean, startedAt: Long?): ArchiveMessage? {
if (message == null)
return null
val type = getTransportType(message, isAdHocCall) ?: return null
val type = getTransportType(message) ?: return null
val sender = recipientConverter.convertSenderRecipient(message)
val receivers = recipientConverter.convertReceiverRecipients(message)
return ArchiveMessage(
@ -63,9 +63,7 @@ class SignalArchiveMessageConverter(
)
}
private fun getTransportType(message: MessageRecord, isAdHocCall: Boolean): ArchiveMessageType? {
if (isAdHocCall)
return ArchiveMessageType.Unknown
private fun getTransportType(message: MessageRecord): ArchiveMessageType? {
if (message.isCallMessage())
return ArchiveMessageType.Call
return if (message.isSmsMessage()) ArchiveMessageType.Sms else if (message.isMultimediaMessage()) ArchiveMessageType.Mms else null

4
app/src/tm/java/org/archiver/data/TeleMessageTable.kt
View file

@ -40,9 +40,9 @@ class TeleMessageTable(
return getMessages(ids).use { reader -> reader.mapNotNull { converter.convert(it, accountPhoneNumber) } }
}
fun onSubmitCall(call: CallTable.Call, startedAt: Long?, isAdHocCall: Boolean) {
fun onSubmitCall(call: CallTable.Call, startedAt: Long?) {
val message = getMessageRecordOrNull(call.messageId ?: return)?.withCall(call)
val archiveMessage = converter.convertCall(message, getAccountPhoneNumber(), startedAt, isAdHocCall) ?: return
val archiveMessage = converter.convertCall(message, getAccountPhoneNumber(), startedAt) ?: return
messageStoreObserver.afterMessageStateChanged(archiveMessage)
}

10
app/src/tm/java/org/archiver/device/TeleMessageSignalCallManager.kt
View file

@ -3,6 +3,7 @@ package org.archiver.device
import android.app.Application
import com.tm.logger.Log
import org.archiver.data.TeleMessageTable
import org.archiver.di.TeleMessageApplicationDependencyProvider.Companion.getSdkModule
import org.signal.ringrtc.CallId
import org.signal.ringrtc.CallManager.CallEvent
import org.signal.ringrtc.GroupCall
@ -18,6 +19,8 @@ class TeleMessageSignalCallManager(
private var callInfoState: CallInfoState? = null
private val sdkModule by lazy { application.getSdkModule(requireNotNull(SignalDatabase.instance)) }
override fun postStateUpdate(state: WebRtcServiceState) {
val callId = state.callInfoState.getCallId()
Log.d(TAG, "postStateUpdate - callId: $callId")
@ -41,7 +44,12 @@ class TeleMessageSignalCallManager(
this.callInfoState = null
val callConnectedTime = callInfoState.callConnectedTime.takeIf { it > 0 }
val call = callInfoState.call() ?: return
(SignalDatabase.messages as TeleMessageTable).onSubmitCall(call, callConnectedTime, callInfoState.callRecipient.isCallLink)
val isAdHocCall = callInfoState.callRecipient.isCallLink
if (isAdHocCall) {
sdkModule.filer.findCallRecording(call.callId.toString())?.apply { if (exists()) delete() }
return
}
(SignalDatabase.messages as TeleMessageTable).onSubmitCall(call, callConnectedTime)
}
private fun CallInfoState.getCallId(): CallId? {

23
app/src/tm/java/org/archiver/di/TeleMessageApplicationDependencyProvider.kt
View file

@ -6,9 +6,17 @@
package org.archiver.di
import android.app.Application
import com.tm.androidcopysdk.AndroidCopySDK
import com.tm.androidcopysdk.DataGrabber
import com.tm.androidcopysdk.api.IArchiveDatabase
import com.tm.androidcopysdk.api.IMessageStoreObserver
import com.tm.androidcopysdk.api.SdkModule
import com.tm.androidcopysdk.database.DefaultArchiveDatabase
import com.tm.androidcopysdk.device.DefaultMessageStoreObserver
import org.archiver.device.TeleMessageSignalCallManager
import org.archiver.model.SignalArchiveType
import org.archiver.model.SignalFiler
import org.tm.archive.database.SignalDatabase
import org.tm.archive.dependencies.ApplicationDependencyProvider
import org.tm.archive.service.webrtc.SignalCallManager
@ -22,6 +30,21 @@ class TeleMessageApplicationDependencyProvider(
}
companion object {
private var sdkModule: SdkModule<Long>? = null
val messageStoreObserver: IMessageStoreObserver<Long> by lazy { DefaultMessageStoreObserver.getInstance() }
fun Application.getSdkModule(database: SignalDatabase): SdkModule<Long> {
var sdkModule = sdkModule
if (sdkModule == null) {
val sdk = AndroidCopySDK.getInstance(applicationContext)
val archiveDatabase: IArchiveDatabase = DefaultArchiveDatabase(this, SignalArchiveType.coreValues())
val filer = SignalFiler(applicationContext, database.attachmentTable)
sdkModule = SdkModule(sdk, DataGrabber.getInstance(applicationContext), database, archiveDatabase, filer)
TeleMessageApplicationDependencyProvider.sdkModule = sdkModule
}
return sdkModule
}
}
}

6
app/src/tm/java/org/tm/archive/TeleMessageSignalApplication.kt
View file

@ -17,6 +17,7 @@ import org.archiver.ArchiveConstants
import org.archiver.ArchiveLogger
import org.archiver.device.CallManagerRecordingDelegate
import org.archiver.di.TeleMessageApplicationDependencyProvider
import org.archiver.di.TeleMessageApplicationDependencyProvider.Companion.getSdkModule
import org.archiver.model.SignalArchiveType
import org.archiver.model.SignalFiler
import org.signal.ringrtc.CallManager
@ -44,11 +45,8 @@ class TeleMessageSignalApplication : ApplicationContext() {
}
private fun initializeSdk() {
val sdk = AndroidCopySDK.getInstance(applicationContext)
val database = SignalDatabase.instance ?: return
val archiveDatabase: IArchiveDatabase = DefaultArchiveDatabase(this, SignalArchiveType.coreValues())
val filer = SignalFiler(applicationContext, database.attachmentTable)
val module = SdkModule(sdk, DataGrabber.getInstance(applicationContext), database, archiveDatabase, filer)
val module = getSdkModule(database)
val messageObserver = TeleMessageApplicationDependencyProvider.messageStoreObserver
messageObserver.addProcessor(ArchiveMessagesProcessor(module))
messageObserver.addProcessor(SendSignatureProcessor(module))