TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into on

Browse Source
This commit is contained in:
Andrew 2024-03-16 14:27:18 +10:30
commit d083b19a12
5 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -31,8 +31,8 @@ configurations.all {
exclude module: "commons-logging" exclude module: "commons-logging"
} }
def canonicalVersionCode = 360 def canonicalVersionCode = 369
def canonicalVersionName = "1.17.5" def canonicalVersionName = "1.18.1"
def postFixSize = 10 def postFixSize = 10
def abiPostFix = ['armeabi-v7a' : 1, def abiPostFix = ['armeabi-v7a' : 1,

2
app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
View File

@ -182,7 +182,7 @@ open class Storage(
} }
override fun getUserProfile(): Profile { override fun getUserProfile(): Profile {
val displayName = TextSecurePreferences.getProfileName(context)!! val displayName = TextSecurePreferences.getProfileName(context)
val profileKey = ProfileKeyUtil.getProfileKey(context) val profileKey = ProfileKeyUtil.getProfileKey(context)
val profilePictureUrl = TextSecurePreferences.getProfilePictureURL(context) val profilePictureUrl = TextSecurePreferences.getProfilePictureURL(context)
return Profile(displayName, profileKey, profilePictureUrl) return Profile(displayName, profileKey, profilePictureUrl)

8
app/src/test/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModelTest.kt
View File

@ -53,6 +53,7 @@ class DisappearingMessagesViewModelTest {
@Mock lateinit var application: Application @Mock lateinit var application: Application
@Mock lateinit var textSecurePreferences: TextSecurePreferences @Mock lateinit var textSecurePreferences: TextSecurePreferences
@Mock lateinit var messageExpirationManager: SSKEnvironment.MessageExpirationManagerProtocol @Mock lateinit var messageExpirationManager: SSKEnvironment.MessageExpirationManagerProtocol
@Mock lateinit var disappearingMessages: DisappearingMessages
@Mock lateinit var threadDb: ThreadDatabase @Mock lateinit var threadDb: ThreadDatabase
@Mock lateinit var groupDb: GroupDatabase @Mock lateinit var groupDb: GroupDatabase
@Mock lateinit var storage: Storage @Mock lateinit var storage: Storage
@ -114,9 +115,9 @@ class DisappearingMessagesViewModelTest {
isSelfAdmin = true, isSelfAdmin = true,
address = LOCAL_ADDRESS, address = LOCAL_ADDRESS,
isNoteToSelf = true, isNoteToSelf = true,
expiryMode = ExpiryMode.NONE, expiryMode = ExpiryMode.Legacy(0),
isNewConfigEnabled = false, isNewConfigEnabled = false,
persistedMode = ExpiryMode.NONE, persistedMode = ExpiryMode.Legacy(0),
showDebugOptions = false showDebugOptions = false
) )
) )
@ -127,7 +128,7 @@ class DisappearingMessagesViewModelTest {
UiState( UiState(
OptionsCard( OptionsCard(
R.string.activity_disappearing_messages_timer, R.string.activity_disappearing_messages_timer,
typeOption(ExpiryMode.NONE, selected = true), typeOption(ExpiryMode.NONE, selected = false),
timeOption(ExpiryType.LEGACY, 12.hours), timeOption(ExpiryType.LEGACY, 12.hours),
timeOption(ExpiryType.LEGACY, 1.days), timeOption(ExpiryType.LEGACY, 1.days),
timeOption(ExpiryType.LEGACY, 7.days), timeOption(ExpiryType.LEGACY, 7.days),
@ -555,6 +556,7 @@ class DisappearingMessagesViewModelTest {
application, application,
textSecurePreferences, textSecurePreferences,
messageExpirationManager, messageExpirationManager,
disappearingMessages,
threadDb, threadDb,
groupDb, groupDb,
storage, storage,

2
libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt
View File

@ -10,7 +10,7 @@ data class ExpirationConfiguration(
val isEnabled = expiryMode.expirySeconds > 0 val isEnabled = expiryMode.expirySeconds > 0
companion object { companion object {
val isNewConfigEnabled = true /* TODO: System.currentTimeMillis() > 1_676_851_200_000 // 13/02/2023 */ val isNewConfigEnabled = true
} }
} }

13
libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt
View File

@ -4,10 +4,11 @@ import com.google.protobuf.ByteString
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
class Profile() { class Profile(
var displayName: String? = null var displayName: String? = null,
var profileKey: ByteArray? = null var profileKey: ByteArray? = null,
var profilePictureURL: String? = null var profilePictureURL: String? = null
) {
companion object { companion object {
const val TAG = "Profile" const val TAG = "Profile"
@ -25,12 +26,6 @@ class Profile() {
} }
} }
constructor(displayName: String, profileKey: ByteArray? = null, profilePictureURL: String? = null) : this() {
this.displayName = displayName
this.profileKey = profileKey
this.profilePictureURL = profilePictureURL
}
fun toProto(): SignalServiceProtos.DataMessage? { fun toProto(): SignalServiceProtos.DataMessage? {
val displayName = displayName val displayName = displayName
if (displayName == null) { if (displayName == null) {