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

Merge remote-tracking branch 'origin/new_features_refactor_06_03_2024' into new_features_refactor_06_03_2024

Browse source
This commit is contained in:
TELEMESSAGE\Davidt 2024-03-26 12:59:09 +02:00
commit 8619c911ea
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/tm/java/org/archiver/converter/SignalChatConverter.kt
View file

@ -21,7 +21,7 @@ class SignalChatConverter(
return ArchiveChat(
id = getChatId(chatRecipient, type) ?: "",
type = type,
name = if (type == ChatType.Group) chatRecipient.getGroupName(context) else chatRecipient.getDisplayName(context),
name = chatRecipient.getDisplayName(context),
isSecret = false,
)
}

2
app/src/tm/java/org/archiver/model/Messages.kt
View file

@ -52,6 +52,6 @@ object Messages {
}
fun MessageRecord.chatRecipient(type: ChatType) =
if (type == ChatType.Group) toRecipient.takeUnless { isOutgoing } ?: fromRecipient//we have only details from our own recipient
if (type != ChatType.Chat) toRecipient.takeUnless { isOutgoing } ?: fromRecipient
else fromRecipient.takeUnless { isOutgoing } ?: toRecipient
}

3
app/src/tm/java/org/tm/archive/conversationlist/ConversationListFragment.kt
View file

@ -13,8 +13,8 @@ import androidx.appcompat.app.AlertDialog
import com.tm.androidcopysdk.CommonUtils
import com.tm.androidcopysdk.network.appSettings.UpdateEvent
import com.tm.androidcopysdk.network.appSettings.WorkerIntentService
import com.tm.androidcopysdk.network.keepAlive.KeepWorkerIntentService
import com.tm.androidcopysdk.utils.PrefManager
import com.tm.androidcopysdk.utils.PrefManagerConstants
import com.tm.authenticatorsdk.mamsdk.IMDMAuthenticator
import com.tm.authenticatorsdk.mamsdk.MDMAuthenticator.isMDM
import com.tm.authenticatorsdk.mamsdk.MDMAuthenticator.startMDMAuthenticator
@ -153,6 +153,7 @@ open class ConversationListFragment : SignalConversationListFragment(), IAuthent
}
if (event.type == UpdateEvent.EVENTS_TYPE.suspension) {
CommonUtils.setActivatedUser(requireContext(), false)
PrefManager.setBooleanPref(requireContext(), PrefManagerConstants.SHARED_PREFERENCE_ACTIVATED_AA_KEY, false)
} else if (event.type == UpdateEvent.EVENTS_TYPE.activated) {
CommonUtils.setActivatedUser(requireContext(), true)
CommonUtils.startBackupService(context)