From f7dde1250cc1f86641112c832e151fed5e3cd50d Mon Sep 17 00:00:00 2001 From: FlyingP1g FlyingP1g Date: Tue, 12 Jul 2022 00:54:15 +0300 Subject: [PATCH 1/8] Added "translated by" to about menu. --- .../briar/android/settings/AboutFragment.java | 11 ++++++++++- briar-android/src/main/res/layout/fragment_about.xml | 11 +++++++++++ briar-android/src/main/res/values/strings.xml | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java index 8c6ce98f0..763279b66 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java @@ -15,7 +15,7 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.BuildConfig; import org.briarproject.briar.R; - +import java.util.Locale; import java.util.logging.Logger; import androidx.annotation.NonNull; @@ -37,6 +37,7 @@ public class AboutFragment extends Fragment { private TextView briarVersion; private TextView briarWebsite; private TextView briarSourceCode; + private TextView translatedBy; @Nullable @Override @@ -56,6 +57,7 @@ public class AboutFragment extends Fragment { getString(R.string.briar_version, BuildConfig.VERSION_NAME)); briarWebsite = requireActivity().findViewById(R.id.BriarWebsite); briarSourceCode = requireActivity().findViewById(R.id.BriarSourceCode); + translatedBy = requireActivity().findViewById(R.id.TranslatedBy); briarWebsite.setOnClickListener(View -> { String url = "https://briarproject.org/"; Intent i = new Intent(Intent.ACTION_VIEW); @@ -80,6 +82,13 @@ public class AboutFragment extends Fragment { R.string.error_start_activity, LENGTH_LONG).show(); } }); + if (!Locale.getDefault().getLanguage() + .equals(Locale.ENGLISH.toString())) { + translatedBy.setVisibility(View.VISIBLE); + translatedBy.setText(getString( + R.string.translated_by, + getString(R.string.translator_name))); + } } } \ No newline at end of file diff --git a/briar-android/src/main/res/layout/fragment_about.xml b/briar-android/src/main/res/layout/fragment_about.xml index 87881bb00..5a0bcc3d9 100644 --- a/briar-android/src/main/res/layout/fragment_about.xml +++ b/briar-android/src/main/res/layout/fragment_about.xml @@ -42,4 +42,15 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/BriarWebsite" /> + + \ No newline at end of file diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index cf78b4ec9..f1f7bf8d7 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -697,6 +697,8 @@ Links \u2022 Briar website \u2022 Briar source code + Translated by: %s + Your name Disappearing messages From 57bd5789d4ebfa5b566abf0cdf3ee5c1131e1079 Mon Sep 17 00:00:00 2001 From: FlyingP1g FlyingP1g Date: Tue, 12 Jul 2022 17:07:28 +0300 Subject: [PATCH 2/8] About menu contribution fixes. --- .../briar/android/settings/AboutFragment.java | 6 +++--- .../src/main/res/layout/fragment_about.xml | 14 ++++++++++++-- briar-android/src/main/res/values/strings.xml | 3 ++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java index 763279b66..f69c10405 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java @@ -15,7 +15,6 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.BuildConfig; import org.briarproject.briar.R; -import java.util.Locale; import java.util.logging.Logger; import androidx.annotation.NonNull; @@ -26,6 +25,7 @@ import static android.widget.Toast.LENGTH_LONG; import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.util.LogUtils.logException; +import static java.util.Locale.*; @MethodsNotNullByDefault @ParametersNotNullByDefault @@ -82,8 +82,8 @@ public class AboutFragment extends Fragment { R.string.error_start_activity, LENGTH_LONG).show(); } }); - if (!Locale.getDefault().getLanguage() - .equals(Locale.ENGLISH.toString())) { + if (!getDefault().getLanguage() + .equals(ENGLISH.toString())) { translatedBy.setVisibility(View.VISIBLE); translatedBy.setText(getString( R.string.translated_by, diff --git a/briar-android/src/main/res/layout/fragment_about.xml b/briar-android/src/main/res/layout/fragment_about.xml index 5a0bcc3d9..f5e8cb203 100644 --- a/briar-android/src/main/res/layout/fragment_about.xml +++ b/briar-android/src/main/res/layout/fragment_about.xml @@ -18,9 +18,9 @@ android:id="@+id/LinksTitle" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="16dp" android:text="@string/links" android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" - android:layout_marginTop="16dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/BriarVersion" /> @@ -49,8 +49,18 @@ android:layout_marginTop="16dp" android:text="@string/translated_by" android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" - android:visibility="invisible" + android:visibility="gone" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/BriarSourceCode" /> + + \ No newline at end of file diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index f1f7bf8d7..f9e3e2f80 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -698,7 +698,8 @@ \u2022 Briar website \u2022 Briar source code Translated by: %s - Your name + Your name + Thanks to all the unlisted contributors in the Localisation Lab Disappearing messages From 0ae94e95791d9c3526cb795d44dd6c15a5d42147 Mon Sep 17 00:00:00 2001 From: FlyingP1g FlyingP1g Date: Tue, 12 Jul 2022 17:30:48 +0300 Subject: [PATCH 3/8] String fix --- .../briarproject/briar/android/settings/AboutFragment.java | 4 +++- briar-android/src/main/res/values/strings.xml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java index f69c10405..41535e22c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java @@ -83,7 +83,9 @@ public class AboutFragment extends Fragment { } }); if (!getDefault().getLanguage() - .equals(ENGLISH.toString())) { + .equals(ENGLISH.toString()) && + getString(R.string.translated_by).length() != 0 && + getString(R.string.translator_name).length() != 0) { translatedBy.setVisibility(View.VISIBLE); translatedBy.setText(getString( R.string.translated_by, diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index f9e3e2f80..4044db6ed 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -697,8 +697,8 @@ Links \u2022 Briar website \u2022 Briar source code - Translated by: %s - Your name + + Thanks to all the unlisted contributors in the Localisation Lab From ad0b28a6845e4641ed504a206af4e167683b3f2e Mon Sep 17 00:00:00 2001 From: FlyingP1g FlyingP1g Date: Tue, 12 Jul 2022 19:18:29 +0300 Subject: [PATCH 4/8] Better wording. --- briar-android/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 4044db6ed..7003735d8 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -699,7 +699,7 @@ \u2022 Briar source code - Thanks to all the unlisted contributors in the Localisation Lab + Thanks to all the contributors at the Localization Lab Disappearing messages From 6ec382cfc4ca52276a086fc26ba2b2d60755313e Mon Sep 17 00:00:00 2001 From: FlyingP1g FlyingP1g Date: Tue, 12 Jul 2022 20:35:53 +0300 Subject: [PATCH 5/8] About menu: Thanks to translators redesign --- .../briar/android/settings/AboutFragment.java | 12 ------------ .../src/main/res/layout/fragment_about.xml | 13 +------------ briar-android/src/main/res/values/strings.xml | 4 +--- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java index 41535e22c..bd3d8acb9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java @@ -25,7 +25,6 @@ import static android.widget.Toast.LENGTH_LONG; import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.util.LogUtils.logException; -import static java.util.Locale.*; @MethodsNotNullByDefault @ParametersNotNullByDefault @@ -37,7 +36,6 @@ public class AboutFragment extends Fragment { private TextView briarVersion; private TextView briarWebsite; private TextView briarSourceCode; - private TextView translatedBy; @Nullable @Override @@ -57,7 +55,6 @@ public class AboutFragment extends Fragment { getString(R.string.briar_version, BuildConfig.VERSION_NAME)); briarWebsite = requireActivity().findViewById(R.id.BriarWebsite); briarSourceCode = requireActivity().findViewById(R.id.BriarSourceCode); - translatedBy = requireActivity().findViewById(R.id.TranslatedBy); briarWebsite.setOnClickListener(View -> { String url = "https://briarproject.org/"; Intent i = new Intent(Intent.ACTION_VIEW); @@ -82,15 +79,6 @@ public class AboutFragment extends Fragment { R.string.error_start_activity, LENGTH_LONG).show(); } }); - if (!getDefault().getLanguage() - .equals(ENGLISH.toString()) && - getString(R.string.translated_by).length() != 0 && - getString(R.string.translator_name).length() != 0) { - translatedBy.setVisibility(View.VISIBLE); - translatedBy.setText(getString( - R.string.translated_by, - getString(R.string.translator_name))); - } } } \ No newline at end of file diff --git a/briar-android/src/main/res/layout/fragment_about.xml b/briar-android/src/main/res/layout/fragment_about.xml index f5e8cb203..c37d695eb 100644 --- a/briar-android/src/main/res/layout/fragment_about.xml +++ b/briar-android/src/main/res/layout/fragment_about.xml @@ -42,17 +42,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/BriarWebsite" /> - - + app:layout_constraintTop_toBottomOf="@+id/BriarSourceCode" /> \ No newline at end of file diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 7003735d8..8acd87bb9 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -697,9 +697,7 @@ Links \u2022 Briar website \u2022 Briar source code - - - Thanks to all the contributors at the Localization Lab + Thanks to all the contributors at the Localization Lab Disappearing messages From 8ea7204cf652f99f6a967c4b585cfc89b63970ce Mon Sep 17 00:00:00 2001 From: FlyingP1g FlyingP1g Date: Tue, 12 Jul 2022 21:10:29 +0300 Subject: [PATCH 6/8] About menu: Added changelog and fixed wording --- .../briar/android/settings/AboutFragment.java | 15 +++++++++++++++ .../src/main/res/layout/fragment_about.xml | 11 ++++++++++- briar-android/src/main/res/values/strings.xml | 5 +++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java index bd3d8acb9..9f87ef2c5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java @@ -36,6 +36,7 @@ public class AboutFragment extends Fragment { private TextView briarVersion; private TextView briarWebsite; private TextView briarSourceCode; + private TextView briarChangelog; @Nullable @Override @@ -55,6 +56,7 @@ public class AboutFragment extends Fragment { getString(R.string.briar_version, BuildConfig.VERSION_NAME)); briarWebsite = requireActivity().findViewById(R.id.BriarWebsite); briarSourceCode = requireActivity().findViewById(R.id.BriarSourceCode); + briarChangelog = requireActivity().findViewById(R.id.BriarChangelog); briarWebsite.setOnClickListener(View -> { String url = "https://briarproject.org/"; Intent i = new Intent(Intent.ACTION_VIEW); @@ -79,6 +81,19 @@ public class AboutFragment extends Fragment { R.string.error_start_activity, LENGTH_LONG).show(); } }); + briarChangelog.setOnClickListener(View -> { + String url = + "https://code.briarproject.org/briar/briar/-/wikis/changelog"; + Intent i = new Intent(Intent.ACTION_VIEW); + i.setData(Uri.parse(url)); + try { + startActivity(i); + } catch (ActivityNotFoundException e) { + logException(LOG, WARNING, e); + Toast.makeText(requireContext(), + R.string.error_start_activity, LENGTH_LONG).show(); + } + }); } } \ No newline at end of file diff --git a/briar-android/src/main/res/layout/fragment_about.xml b/briar-android/src/main/res/layout/fragment_about.xml index c37d695eb..48f3355df 100644 --- a/briar-android/src/main/res/layout/fragment_about.xml +++ b/briar-android/src/main/res/layout/fragment_about.xml @@ -42,6 +42,15 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/BriarWebsite" /> + + + app:layout_constraintTop_toBottomOf="@+id/BriarChangelog" /> \ No newline at end of file diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 8acd87bb9..e2f028edc 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -695,8 +695,9 @@ About Briar Version: %s Links - \u2022 Briar website - \u2022 Briar source code + \u2022 Website + \u2022 Source code + \u2022 Changelog Thanks to all the contributors at the Localization Lab From c13c2d62f54f1394b82f927ce12ee986f9de08f7 Mon Sep 17 00:00:00 2001 From: FlyingP1g FlyingP1g Date: Tue, 12 Jul 2022 22:26:58 +0300 Subject: [PATCH 7/8] About menu: Added tor version and small wording fixes --- briar-android/build.gradle | 1 + .../briar/android/settings/AboutFragment.java | 4 ++++ briar-android/src/main/res/layout/fragment_about.xml | 11 ++++++++++- briar-android/src/main/res/values/strings.xml | 5 +++-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 020683dfd..0b7234bd5 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -29,6 +29,7 @@ android { versionCode 10410 versionName "1.4.10" applicationId "org.briarproject.briar.android" + buildConfigField "String", "TorVersion", "\"$tor_version\"" vectorDrawables.useSupportLibrary = true buildConfigField "String", "GitHash", diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java index 9f87ef2c5..45d8db150 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java @@ -34,6 +34,7 @@ public class AboutFragment extends Fragment { private static final Logger LOG = getLogger(TAG); private TextView briarVersion; + private TextView torVersion; private TextView briarWebsite; private TextView briarSourceCode; private TextView briarChangelog; @@ -54,6 +55,9 @@ public class AboutFragment extends Fragment { briarVersion = requireActivity().findViewById(R.id.BriarVersion); briarVersion.setText( getString(R.string.briar_version, BuildConfig.VERSION_NAME)); + torVersion = requireActivity().findViewById(R.id.TorVersion); + torVersion.setText( + getString(R.string.tor_version, BuildConfig.TorVersion)); briarWebsite = requireActivity().findViewById(R.id.BriarWebsite); briarSourceCode = requireActivity().findViewById(R.id.BriarSourceCode); briarChangelog = requireActivity().findViewById(R.id.BriarChangelog); diff --git a/briar-android/src/main/res/layout/fragment_about.xml b/briar-android/src/main/res/layout/fragment_about.xml index 48f3355df..39537855e 100644 --- a/briar-android/src/main/res/layout/fragment_about.xml +++ b/briar-android/src/main/res/layout/fragment_about.xml @@ -14,6 +14,15 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + app:layout_constraintTop_toBottomOf="@+id/TorVersion" /> Different Person %1$s and %2$s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else. Pending contact updated - + Unverified contact @@ -693,7 +693,8 @@ About - Briar Version: %s + Briar version: %s + Tor version: %s Links \u2022 Website \u2022 Source code From 89cce89650ee8f70182588f60526fd05fa374508 Mon Sep 17 00:00:00 2001 From: FlyingP1g FlyingP1g Date: Fri, 15 Jul 2022 20:25:43 +0300 Subject: [PATCH 8/8] About menu: Added url method. --- .../briar/android/settings/AboutFragment.java | 43 +++++++------------ 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java index 45d8db150..881ef846f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java @@ -63,41 +63,30 @@ public class AboutFragment extends Fragment { briarChangelog = requireActivity().findViewById(R.id.BriarChangelog); briarWebsite.setOnClickListener(View -> { String url = "https://briarproject.org/"; - Intent i = new Intent(Intent.ACTION_VIEW); - i.setData(Uri.parse(url)); - try { - startActivity(i); - } catch (ActivityNotFoundException e) { - logException(LOG, WARNING, e); - Toast.makeText(requireContext(), - R.string.error_start_activity, LENGTH_LONG).show(); - } + goToUrl(url); }); briarSourceCode.setOnClickListener(View -> { String url = "https://code.briarproject.org/briar/briar"; - Intent i = new Intent(Intent.ACTION_VIEW); - i.setData(Uri.parse(url)); - try { - startActivity(i); - } catch (ActivityNotFoundException e) { - logException(LOG, WARNING, e); - Toast.makeText(requireContext(), - R.string.error_start_activity, LENGTH_LONG).show(); - } + goToUrl(url); }); briarChangelog.setOnClickListener(View -> { String url = "https://code.briarproject.org/briar/briar/-/wikis/changelog"; - Intent i = new Intent(Intent.ACTION_VIEW); - i.setData(Uri.parse(url)); - try { - startActivity(i); - } catch (ActivityNotFoundException e) { - logException(LOG, WARNING, e); - Toast.makeText(requireContext(), - R.string.error_start_activity, LENGTH_LONG).show(); - } + goToUrl(url); }); } + private void goToUrl(String url) { + Intent i = new Intent(Intent.ACTION_VIEW); + i.setData(Uri.parse(url)); + try { + startActivity(i); + } catch (ActivityNotFoundException e) { + logException(LOG, WARNING, e); + Toast.makeText(requireContext(), + R.string.error_start_activity, LENGTH_LONG).show(); + } + + } + } \ No newline at end of file