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

Merge branch 'strings-squashed' into SES360-time-date-formats

Browse Source
This commit is contained in:
alansley 2024-08-30 06:25:36 +10:00 committed by fanchao
parent e543428ed5
commit 7812667e69
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt
View File

@ -19,7 +19,6 @@ import org.session.libsession.utilities.getExpirationTypeDisplayValue
import org.thoughtcrime.securesms.database.model.MessageRecord import org.thoughtcrime.securesms.database.model.MessageRecord
import org.thoughtcrime.securesms.showSessionDialog import org.thoughtcrime.securesms.showSessionDialog
import org.thoughtcrime.securesms.ui.getSubbedCharSequence import org.thoughtcrime.securesms.ui.getSubbedCharSequence
import org.thoughtcrime.securesms.ui.getSubbedString
import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
import javax.inject.Inject import javax.inject.Inject
import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.milliseconds

2
app/src/main/res/xml/preferences_privacy.xml
View File

@ -39,7 +39,7 @@
android:key="pref_typing_indicators" android:key="pref_typing_indicators"
android:title="@string/typingIndicators" android:title="@string/typingIndicators"
android:summary="@string/typingIndicatorsDescription" /> android:summary="@string/typingIndicatorsDescription" />
<!-- TODO ACL: Need to show a live typing indicator here & remove the "(...)" from the above string (if it's there - it might have been removed now) --> <!-- TODO ACL: Need to show a live typing indicator here! -->
</PreferenceCategory> </PreferenceCategory>