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 bd3d8acb9..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
@@ -34,8 +34,10 @@ 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;
@Nullable
@Override
@@ -53,32 +55,38 @@ 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);
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";
+ 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
diff --git a/briar-android/src/main/res/layout/fragment_about.xml b/briar-android/src/main/res/layout/fragment_about.xml
index c37d695eb..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" />
+
+
+ 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 b9c61c30c..1d570a1a5 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -693,10 +693,12 @@
About
- Briar Version: %s
+ Briar version: %s
+ Tor 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