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