Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'privacy-policy' into 'master'

Browse Source 
Added privacy policy to menu and report form.

Closes #2351

See merge request briar/briar!1695
This commit is contained in:
akwizgran
2022-08-17 11:32:12 +00:00
parent bcc7a4b93b 3cd388decd
commit 4af895d124
5 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
briar-android/src/main/res/layout/fragment_about.xml
View File

@@ -60,6 +60,15 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/BriarSourceCode" />
<TextView
android:id="@+id/BriarPrivacyPolicy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/briar_privacy_policy"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/BriarChangelog" />
<TextView
android:id="@+id/TranslatorThanks"
android:layout_width="match_parent"
@@ -68,6 +77,6 @@
android:text="@string/translator_thanks"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/BriarChangelog" />
app:layout_constraintTop_toBottomOf="@+id/BriarPrivacyPolicy" />
</androidx.constraintlayout.widget.ConstraintLayout>

15
briar-android/src/main/res/layout/fragment_report_form.xml
View File

@@ -56,6 +56,18 @@
</com.google.android.material.textfield.TextInputLayout>
<TextView
android:id="@+id/PrivacyPolicy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_large"
android:layout_marginRight="@dimen/margin_large"
android:layout_marginTop="@dimen/margin_large"
android:text="@string/privacy_policy"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/user_email_layout" />
<CheckBox
android:id="@+id/include_debug_report"
android:layout_width="0dp"
@@ -74,9 +86,10 @@
style="@style/BriarButtonFlat.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium"
android:text="@string/show"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/user_email_layout" />
app:layout_constraintTop_toBottomOf="@+id/PrivacyPolicy" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list"

2
briar-android/src/main/res/values/strings.xml
View File

@@ -699,6 +699,7 @@
<string name="briar_website">\u2022 <a href="">Website</a></string>
<string name="briar_source_code">\u2022 <a href="">Source code</a></string>
<string name="briar_changelog">\u2022 <a href="">Changelog</a></string>
<string name="briar_privacy_policy">\u2022 <a href="">Privacy Policy</a></string>
<!-- Here translators can add their names or Transifex usernames(eg "Thanks to all the contributors at the Localization Lab, especially Tom, Matthew and Jerry") -->
<string name="translator_thanks">Thanks to all the contributors at the Localization Lab</string>
@@ -736,6 +737,7 @@
<string name="describe_crash">Describe what happened (optional)</string>
<string name="enter_feedback">Enter your feedback</string>
<string name="optional_contact_email">Your email address (optional)</string>
<string name="privacy_policy">By sending us data you agree to our <a href="">privacy policy</a></string>
<string name="include_debug_report_crash">Include anonymous data about the crash</string>
<string name="include_debug_report_feedback">Include anonymous data about this device</string>
<string name="dev_report_user_info">User information</string>