TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-21 12:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update expiry configuration

Browse Source
This commit is contained in:
charles
2022-11-16 10:45:58 +11:00
parent b529d6d341
commit 6eba3ac8af
24 changed files with 2623 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsActivity.kt
View File

@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.RecyclerView
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
import network.loki.messenger.BuildConfig
import network.loki.messenger.R
import network.loki.messenger.databinding.ActivityExpirationSettingsBinding
import org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType
@@ -41,7 +42,15 @@ class ExpirationSettingsActivity: PassphraseRequiredActionBarActivity() {
.zip(resources.getStringArray(R.array.read_expiration_time_names)) { value, name -> RadioOption(value, name)}
val afterSendOptions = resources.getIntArray(R.array.send_expiration_time_values).map(Int::toString)
.zip(resources.getStringArray(R.array.send_expiration_time_names)) { value, name -> RadioOption(value, name)}
viewModelFactory.create(threadId, afterReadOptions, afterSendOptions)
viewModelFactory.create(threadId, mayAddTestExpiryOption(afterReadOptions), mayAddTestExpiryOption(afterSendOptions))
}
private fun mayAddTestExpiryOption(expiryOptions: List<RadioOption>): List<RadioOption> {
return if (BuildConfig.DEBUG) {
val options = expiryOptions.toMutableList()
options.add(1, RadioOption("60", "1 Minute"))
options
} else expiryOptions
}
override fun onSaveInstanceState(outState: Bundle) {

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

@@ -12,6 +12,7 @@ import org.session.libsession.messaging.jobs.Job
import org.session.libsession.messaging.jobs.JobQueue
import org.session.libsession.messaging.jobs.MessageReceiveJob
import org.session.libsession.messaging.jobs.MessageSendJob
import org.session.libsession.messaging.messages.ExpirationSettingsConfiguration
import org.session.libsession.messaging.messages.Message
import org.session.libsession.messaging.messages.control.ConfigurationMessage
import org.session.libsession.messaging.messages.control.MessageRequestResponse
@@ -961,4 +962,16 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
return recipientDb.blockedContacts
}
override fun getExpirationSettingsConfiguration(threadId: Long): ExpirationSettingsConfiguration? {
return null
}
override fun addExpirationSettingsConfiguration(config: ExpirationSettingsConfiguration) {
}
override fun getExpiringMessages(messageIds: LongArray): List<Pair<String, Int>> {
return emptyList()
}
}

1
app/src/main/res/menu/menu_conversation.xml
View File

@@ -6,7 +6,6 @@
<item
android:id="@+id/menu_overflow"
android:icon="@drawable/ic_outline_settings_24"
android:title="@string/conversation_context__menu_call"
app:showAsAction="always">
<menu>