mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-11 17:48:23 +00:00
[SS-54] Add dialog to allow local deletion if network deletion fails (#1526)
* WIP * Push before attempting some HTTPRequestFailedException rate limiting * Functionality now works * Merging dev resulted in some subproject commit change so pushing that * Fixes #1525 * Addressed Andy PR feedback * Addressed further PR feedback from Andy --------- Co-authored-by: alansley <aclansley@gmail.com>
This commit is contained in:
@@ -25,7 +25,6 @@ import org.session.libsignal.utilities.Snode
|
||||
import org.session.libsignal.utilities.ThreadUtils
|
||||
import org.session.libsignal.utilities.recover
|
||||
import org.session.libsignal.utilities.toHexString
|
||||
import java.util.Date
|
||||
import java.util.concurrent.atomic.AtomicReference
|
||||
import kotlin.collections.set
|
||||
|
||||
|
@@ -73,4 +73,10 @@
|
||||
<string name="ConversationItem_group_action_left">%1$s has left the group.</string>
|
||||
<!-- RecipientProvider -->
|
||||
<string name="RecipientProvider_unnamed_group">Unnamed group</string>
|
||||
|
||||
<string name="clearDataErrorDescriptionGeneric">An unknown error occurred and your data was not deleted. Do you want to delete your data from just this device instead?</string>
|
||||
<string name="errorUnknown">An unknown error occurred.</string>
|
||||
<string name="clearDevice">Clear Device</string>
|
||||
<string name="clearDeviceOnly">Clear device only</string>
|
||||
<string name="clearDeviceAndNetwork">Clear device and network</string>
|
||||
</resources>
|
||||
|
Reference in New Issue
Block a user