From d49e390f1e7e8ac3274ececec2cf01f016ee33f8 Mon Sep 17 00:00:00 2001
From: Andreas <urdalaqjnb@posteo.de>
Date: Sun, 21 Sep 2025 19:47:52 +0200
Subject: [PATCH 1/3] Replace quote approval policy value "No one" with "Just
 me"

The quote approval policies defined by "Mastodon" are: "Anyone",
"Followers only" and "Just me".
Fedilab uses "No one" instead of "Just me" which triggered #1298
This commit replaces all occurrences of "no one"/"no_one" with "Just
me"/"just_me" to match the official value.
---
 .../res/layouts/mastodon/layout/activity_edit_profile.xml     | 4 ++--
 .../res/layouts/mastodon/layout/drawer_status_compose.xml     | 4 ++--
 app/src/main/res/values-ca/strings.xml                        | 2 +-
 app/src/main/res/values-cs/strings.xml                        | 2 +-
 app/src/main/res/values-gl/strings.xml                        | 2 +-
 app/src/main/res/values-ja/strings.xml                        | 2 +-
 app/src/main/res/values-uk/strings.xml                        | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml                    | 2 +-
 app/src/main/res/values/strings.xml                           | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/layouts/mastodon/layout/activity_edit_profile.xml b/app/src/main/res/layouts/mastodon/layout/activity_edit_profile.xml
index 1a52d0bf..5a93a5b1 100644
--- a/app/src/main/res/layouts/mastodon/layout/activity_edit_profile.xml
+++ b/app/src/main/res/layouts/mastodon/layout/activity_edit_profile.xml
@@ -389,11 +389,11 @@
                 app:singleSelection="true">
 
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/quote_approval_policy_no_one"
+                    android:id="@+id/quote_approval_policy_just_me"
                     style="@style/Fedilab.OutlinedButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/no_one"
+                    android:text="@string/just_me"
                     android:textAlignment="textStart"
                     app:icon="@drawable/ic_quote_policy_nobody" />
 
diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_status_compose.xml b/app/src/main/res/layouts/mastodon/layout/drawer_status_compose.xml
index 55bd35ba..3fc25fa2 100644
--- a/app/src/main/res/layouts/mastodon/layout/drawer_status_compose.xml
+++ b/app/src/main/res/layouts/mastodon/layout/drawer_status_compose.xml
@@ -466,14 +466,14 @@
                 app:singleSelection="true">
 
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/button_quote_approval_policy_no_one"
+                    android:id="@+id/button_quote_approval_policy_just_me"
                     style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:insetTop="0dp"
                     android:insetBottom="0dp"
                     android:minHeight="36dp"
-                    android:text="@string/no_one"
+                    android:text="@string/just_me"
                     android:textAlignment="textStart"
                     app:icon="@drawable/ic_quote_policy_nobody" />
 
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index e8db2466..0657c1d2 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1127,7 +1127,7 @@
     <string name="set_tracking_parameters">Suprimir paràmetres de rastreig</string>
     <string name="set_tracking_parameters_indication">L\'app suprimirà automàticament els paràmetres de rastreig d\'URLs abans de visitar un enllaç.</string>
     <string name="who_can_quote">Qui pot citar</string>
-    <string name="no_one">Ningú</string>
+    <string name="just_me">Ningú</string>
     <string name="anyone">Tothom</string>
     <string name="set_translate_button">Botó de traducció</string>
     <string name="action_unreblog">Desdifondre</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 19a979ad..0ebeaf3d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1134,7 +1134,7 @@
     <string name="set_tracking_parameters">Odstranit sledovací parametry</string>
     <string name="set_tracking_parameters_indication">Aplikace automaticky odstraní sledovací parametry z URL před návštěvou odkazu.</string>
     <string name="who_can_quote">Kdo může citovat</string>
-    <string name="no_one">Nikdo</string>
+    <string name="just_me">Nikdo</string>
     <string name="anyone">Kdokoliv</string>
     <string name="add_featured_hashtag">Přidat oblíbený hashtag</string>
     <string name="no_feature_hashtag_suggestion">Žádné návrhy na oblíbené hashtagy!</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index c4f8134e..3d16b0d1 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1123,7 +1123,7 @@
     <string name="about_website">Sitio web:</string>
     <string name="about_donate">Doar:</string>
     <string name="who_can_quote">Quen pode citar</string>
-    <string name="no_one">Ninguén</string>
+    <string name="just_me">Ninguén</string>
     <string name="anyone">Calquera</string>
     <string name="set_translate_button">Botón para traducir</string>
     <string name="move_timeline_up">Mover arriba a cronoloxía</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 993c2911..75cf6539 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1128,7 +1128,7 @@
     <string name="about_donate">寄付:</string>
     <string name="default_who_can_quote">デフォルトの見積可能者を選択</string>
     <string name="who_can_quote">見積可能者</string>
-    <string name="no_one">誰も</string>
+    <string name="just_me">誰も</string>
     <string name="anyone">誰か</string>
     <string name="set_translate_button">翻訳ボタン</string>
     <string name="action_unreblog">アンブースト</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index c770f3b1..0c7fa20c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1135,7 +1135,7 @@
     <string name="about_website">Вебсайт:</string>
     <string name="about_donate">Пожертвувати:</string>
     <string name="who_can_quote">Хто може цитувати</string>
-    <string name="no_one">Ніхто</string>
+    <string name="just_me">Ніхто</string>
     <string name="anyone">Будь-хто</string>
     <string name="default_who_can_quote">Вибір за замовчуванням для тих, хто може котирувати</string>
     <string name="set_translate_button">Кнопка перекладу</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 71849249..dae75ca3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1125,7 +1125,7 @@
     <string name="about_fediverse">联邦宇宙：</string>
     <string name="about_website">网站：</string>
     <string name="who_can_quote">谁可引用</string>
-    <string name="no_one">无人</string>
+    <string name="just_me">无人</string>
     <string name="anyone">任何人</string>
     <string name="default_who_can_quote">谁可以引用的默认选择</string>
     <string name="set_translate_button">翻译按钮</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b394a0b1..65f948f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -692,7 +692,7 @@
     <string name="followers_only">Followers only</string>
     <string name="who_can_quote">Who can quote</string>
     <string name="quoting_messages">Quoting messages</string>
-    <string name="no_one">No one</string>
+    <string name="just_me">Just me</string>
     <string name="anyone">Anyone</string>
     <string name="other">Other</string>
     <string name="eg_sensitive_content">Eg.: Sensitive Content</string>

From 75aeffe5524ee1af0ea731c9aef154a66dedb4d4 Mon Sep 17 00:00:00 2001
From: 0xd9a <0xd9a@noreply.codeberg.org>
Date: Mon, 22 Sep 2025 11:32:57 +0530
Subject: [PATCH 2/3] Remove changed strings from translated string files

---
 app/src/main/res/values-ca/strings.xml     | 1 -
 app/src/main/res/values-cs/strings.xml     | 1 -
 app/src/main/res/values-gl/strings.xml     | 1 -
 app/src/main/res/values-ja/strings.xml     | 1 -
 app/src/main/res/values-uk/strings.xml     | 1 -
 app/src/main/res/values-zh-rCN/strings.xml | 1 -
 6 files changed, 6 deletions(-)

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 0657c1d2..62c47eca 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1127,7 +1127,6 @@
     <string name="set_tracking_parameters">Suprimir paràmetres de rastreig</string>
     <string name="set_tracking_parameters_indication">L\'app suprimirà automàticament els paràmetres de rastreig d\'URLs abans de visitar un enllaç.</string>
     <string name="who_can_quote">Qui pot citar</string>
-    <string name="just_me">Ningú</string>
     <string name="anyone">Tothom</string>
     <string name="set_translate_button">Botó de traducció</string>
     <string name="action_unreblog">Desdifondre</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 0ebeaf3d..96adf2b0 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1134,7 +1134,6 @@
     <string name="set_tracking_parameters">Odstranit sledovací parametry</string>
     <string name="set_tracking_parameters_indication">Aplikace automaticky odstraní sledovací parametry z URL před návštěvou odkazu.</string>
     <string name="who_can_quote">Kdo může citovat</string>
-    <string name="just_me">Nikdo</string>
     <string name="anyone">Kdokoliv</string>
     <string name="add_featured_hashtag">Přidat oblíbený hashtag</string>
     <string name="no_feature_hashtag_suggestion">Žádné návrhy na oblíbené hashtagy!</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 3d16b0d1..59064d6b 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1123,7 +1123,6 @@
     <string name="about_website">Sitio web:</string>
     <string name="about_donate">Doar:</string>
     <string name="who_can_quote">Quen pode citar</string>
-    <string name="just_me">Ninguén</string>
     <string name="anyone">Calquera</string>
     <string name="set_translate_button">Botón para traducir</string>
     <string name="move_timeline_up">Mover arriba a cronoloxía</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 75cf6539..ded65238 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1128,7 +1128,6 @@
     <string name="about_donate">寄付:</string>
     <string name="default_who_can_quote">デフォルトの見積可能者を選択</string>
     <string name="who_can_quote">見積可能者</string>
-    <string name="just_me">誰も</string>
     <string name="anyone">誰か</string>
     <string name="set_translate_button">翻訳ボタン</string>
     <string name="action_unreblog">アンブースト</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 0c7fa20c..16da2dca 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1135,7 +1135,6 @@
     <string name="about_website">Вебсайт:</string>
     <string name="about_donate">Пожертвувати:</string>
     <string name="who_can_quote">Хто може цитувати</string>
-    <string name="just_me">Ніхто</string>
     <string name="anyone">Будь-хто</string>
     <string name="default_who_can_quote">Вибір за замовчуванням для тих, хто може котирувати</string>
     <string name="set_translate_button">Кнопка перекладу</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index dae75ca3..b45f8e2e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1125,7 +1125,6 @@
     <string name="about_fediverse">联邦宇宙：</string>
     <string name="about_website">网站：</string>
     <string name="who_can_quote">谁可引用</string>
-    <string name="just_me">无人</string>
     <string name="anyone">任何人</string>
     <string name="default_who_can_quote">谁可以引用的默认选择</string>
     <string name="set_translate_button">翻译按钮</string>

From 491159eb2612388ba0a11f81a83b9de8808ce780 Mon Sep 17 00:00:00 2001
From: 0xd9a <0xd9a@noreply.codeberg.org>
Date: Mon, 22 Sep 2025 11:38:04 +0530
Subject: [PATCH 3/3] Change "Just Me" resource ids in more places

---
 .../android/mastodon/activities/EditProfileActivity.java      | 4 ++--
 .../fedilab/android/mastodon/ui/drawer/ComposeAdapter.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java
index 833f75aa..29428541 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java
@@ -200,7 +200,7 @@ public class EditProfileActivity extends BaseBarActivity {
         String quotePolicy = Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.source.quote_policy;
         if (quotePolicy != null) {
             switch (quotePolicy) {
-                case "nobody" -> binding.quoteApprovalPolicyNoOne.setChecked(true);
+                case "nobody" -> binding.quoteApprovalPolicyJustMe.setChecked(true);
                 case "followers" -> binding.quoteApprovalPolicyFollowersOnly.setChecked(true);
                 case "public" -> binding.quoteApprovalPolicyAnyone.setChecked(true);
             }
@@ -397,7 +397,7 @@ public class EditProfileActivity extends BaseBarActivity {
     }
 
     private String getQuotePolicy() {
-        if (binding.quoteApprovalPolicyNoOne.isChecked()) {
+        if (binding.quoteApprovalPolicyJustMe.isChecked()) {
             return "nobody";
         } else if (binding.quoteApprovalPolicyFollowersOnly.isChecked()) {
             return "followers";
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
index 416be0dd..3a4926c5 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
@@ -1768,7 +1768,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 applyColor(context, holder, statusDraft.visibility);
                 unlisted_changed = true;
             });
-            holder.binding.buttonQuoteApprovalPolicyNoOne.setOnClickListener(v -> {
+            holder.binding.buttonQuoteApprovalPolicyJustMe.setOnClickListener(v -> {
                 holder.binding.quoteApprovalPolicyPanel.setVisibility(View.GONE);
                 holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_quote_policy_nobody);
                 statusDraft.quote_approval_policy = MastodonHelper.quote_visibility.NOBODY.name();