diff --git a/app/src/main/java/org/futo/circles/model/ConfirmationType.kt b/app/src/main/java/org/futo/circles/model/ConfirmationType.kt
index efa6e3b8ded7b4c0585add79c98b0b6f7ae7f1fc..33d59c0506b8305790ebd8428b4f9804b4194d3e 100644
--- a/app/src/main/java/org/futo/circles/model/ConfirmationType.kt
+++ b/app/src/main/java/org/futo/circles/model/ConfirmationType.kt
@@ -87,16 +87,4 @@ data class ResendInvite(
override val titleRes: Int = R.string.resend_invite,
override val messageRes: Int = R.string.resend_invite_message,
override val positiveButtonRes: Int = android.R.string.ok
-) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
-
-data class RemoveSession(
- override val titleRes: Int = R.string.remove_session,
- override val messageRes: Int = R.string.remove_session_message,
- override val positiveButtonRes: Int = R.string.remove
-) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
-
-data class ResetKeys(
- override val titleRes: Int = R.string.reset_keys,
- override val messageRes: Int = R.string.reset_keys_message,
- override val positiveButtonRes: Int = R.string.confirm
) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 427bd788554dec81eaaaa9e8b8e7374881aa2ea6..ab9cb184c0dadff3b96a48ffb07ea7bfa1bda190 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -139,8 +139,6 @@
<string name="user_id">User ID</string>
<string name="active_login_sessions">Active login sessions</string>
<string name="verify">Verify</string>
- <string name="remove_session">Remove session</string>
- <string name="remove_session_message">In order to sign out from this session you should confirm your auth.</string>
<string name="save_to_device">Save to device</string>
<string name="save_to_gallery">Save to gallery</string>
<string name="unignore">Unignore</string>
@@ -149,9 +147,6 @@
<string name="system_notices">System notices</string>
<string name="push_notifications">Push notifications</string>
<string name="push_notifications_test">Push notifications test</string>
- <string name="confirm">Confirm</string>
- <string name="reset_keys">Reset keys</string>
- <string name="reset_keys_message">Confirm auth to reset keys and enable cross signing</string>
<string name="share_with_group">Share with a group</string>
<string name="share_with_circle">Share with a circle</string>
<string name="group">Group</string>
@@ -276,7 +271,6 @@
<string name="configuring_workspace">Configuring workspace</string>
<string name="shared_circles">Shared Circles</string>
<string name="remove_user">Remove user</string>
- <string name="remove">Remove</string>
<string name="save">Save</string>
<string name="share_room">Share room</string>
<string name="share_url">Share url</string>
diff --git a/auth/src/main/java/org/futo/circles/auth/model/ConfirmationType.kt b/auth/src/main/java/org/futo/circles/auth/model/ConfirmationType.kt
index 78ae193122b1345c9f1f6b65581f342b282726af..dfd7d67b9c1078405e9cbcb7cd4b643c55c28a4c 100644
--- a/auth/src/main/java/org/futo/circles/auth/model/ConfirmationType.kt
+++ b/auth/src/main/java/org/futo/circles/auth/model/ConfirmationType.kt
@@ -6,7 +6,7 @@ import org.futo.circles.core.model.ConfirmationType
data class RemoveUser(
override val titleRes: Int = R.string.remove_user,
override val messageRes: Int = R.string.remove_user_message,
- override val positiveButtonRes: Int = R.string.remove
+ override val positiveButtonRes: Int = org.futo.circles.core.R.string.remove
) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
data class SwitchUser(
diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
index bfb276169c3fbd9e2c4806398e05dbb0606511ab..d352c7353451ffff81c52af2acb43683fb4c77d4 100644
--- a/auth/src/main/res/values/strings.xml
+++ b/auth/src/main/res/values/strings.xml
@@ -87,7 +87,6 @@
<string name="validate_your_email">Validate your email</string>
<string name="remove_user">Remove user</string>
<string name="remove_user_message">Are you sure you want to remove this user?</string>
- <string name="remove">Remove</string>
<string name="not_supported_navigation_event">Not supported navigation event</string>
<string name="feature_not_supported">Feature is not supported</string>
<string name="service_unavailable">Service unavailable</string>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index db9f9e140243619586888686fa43a8e27247a019..0b1eabbc63e4c0da80833dd768e89ec0ccca3c36 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -52,5 +52,6 @@
<string name="save">Save</string>
<string name="select_items_from_list_below">Select items from list below</string>
<string name="password_changed">Password changed</string>
+ <string name="remove">Remove</string>
</resources>
\ No newline at end of file
diff --git a/gallery/src/main/java/org/futo/circles/gallery/model/ConfirmationType.kt b/gallery/src/main/java/org/futo/circles/gallery/model/ConfirmationType.kt
index 0512e3a5d6b8dcabae0fd1396db956b9d203e4e6..c1cbfe9bdece1cef761fb298b53575279a75a2f1 100644
--- a/gallery/src/main/java/org/futo/circles/gallery/model/ConfirmationType.kt
+++ b/gallery/src/main/java/org/futo/circles/gallery/model/ConfirmationType.kt
@@ -12,5 +12,5 @@ data class DeleteGallery(
data class RemoveImage(
override val titleRes: Int = R.string.remove_image,
override val messageRes: Int = R.string.remove_image_message,
- override val positiveButtonRes: Int = R.string.remove
+ override val positiveButtonRes: Int = org.futo.circles.core.R.string.remove
) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
\ No newline at end of file
diff --git a/gallery/src/main/res/values/strings.xml b/gallery/src/main/res/values/strings.xml
index 747d65ad3a5ca545c940f520d32993b2ac6905ed..abfe0f26a288f34cb46d0a4763d93ab04be55539 100644
--- a/gallery/src/main/res/values/strings.xml
+++ b/gallery/src/main/res/values/strings.xml
@@ -9,7 +9,6 @@
<string name="delete">Delete</string>
<string name="remove_image">Remove image</string>
<string name="remove_image_message">Are you sure you want to remove this image?</string>
- <string name="remove">Remove</string>
<string name="upload_to_gallery">Upload to gallery</string>
<string name="save_to_gallery">Save to gallery</string>
<string name="all_galleries">All Galleries</string>
diff --git a/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDialogFragment.kt b/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDialogFragment.kt
index 7a551c169e682f6eb0057c2b8b49c64189e77032..27334e498f1555ba5438f214d6788c329bcb63a6 100644
--- a/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDialogFragment.kt
+++ b/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDialogFragment.kt
@@ -18,6 +18,8 @@ import org.futo.circles.settings.R
import org.futo.circles.settings.databinding.DialogFragmentActiveSessionsBinding
import org.futo.circles.settings.feature.active_sessions.list.ActiveSessionClickListener
import org.futo.circles.settings.feature.active_sessions.list.ActiveSessionsAdapter
+import org.futo.circles.settings.model.RemoveSession
+import org.futo.circles.settings.model.ResetKeys
@AndroidEntryPoint
class ActiveSessionsDialogFragment :
diff --git a/settings/src/main/java/org/futo/circles/settings/model/ConfirmationType.kt b/settings/src/main/java/org/futo/circles/settings/model/ConfirmationType.kt
index 68b24b1176285bebf497d319152b3712f54b99e1..84a787b2a03faafa85d0f2328d9cdf701d06aa5c 100644
--- a/settings/src/main/java/org/futo/circles/settings/model/ConfirmationType.kt
+++ b/settings/src/main/java/org/futo/circles/settings/model/ConfirmationType.kt
@@ -9,3 +9,15 @@ data class DeactivateAccount(
override val positiveButtonRes: Int = R.string.deactivate
) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
+data class RemoveSession(
+ override val titleRes: Int = R.string.remove_session,
+ override val messageRes: Int = R.string.remove_session_message,
+ override val positiveButtonRes: Int = org.futo.circles.core.R.string.remove
+) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
+
+data class ResetKeys(
+ override val titleRes: Int = R.string.reset_keys,
+ override val messageRes: Int = R.string.reset_keys_message,
+ override val positiveButtonRes: Int = R.string.confirm
+) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
+
diff --git a/settings/src/main/res/values/strings.xml b/settings/src/main/res/values/strings.xml
index 0edf213bd76916fee6c8b4fdda32bcdf2c16313f..f64225da5622d7235b297bff36fdbd8d657e12f9 100644
--- a/settings/src/main/res/values/strings.xml
+++ b/settings/src/main/res/values/strings.xml
@@ -15,4 +15,10 @@
<string name="deactivate_my_account">Deactivate my account</string>
<string name="deactivate_message">This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user lD. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.</string>
<string name="deactivate">Deactivate</string>
+ <string name="remove_session">Remove session</string>
+ <string name="remove_session_message">In order to sign out from this session you should confirm your auth.</string>
+ <string name="reset_keys">Reset keys</string>
+ <string name="reset_keys_message">Confirm auth to reset keys and enable cross signing</string>
+ <string name="confirm">Confirm</string>
+
</resources>
\ No newline at end of file