Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1872-key-agreement' into 'master'

Browse Source 
Finish migrating KeyAgreementActivity to ViewModel

Closes #1982 and #1872

See merge request briar/briar!1357
This commit is contained in:
akwizgran
2021-04-12 13:19:51 +00:00
parent a066190c60 cdae8b35f5
commit 5305dd62d1
30 changed files with 1410 additions and 1230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/res/layout/activity_fragment_container_toolbar.xml
View File

@@ -4,11 +4,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".android.keyagreement.KeyAgreementActivity">
tools:context=".android.contact.add.nearby.AddNearbyContactActivity">
<include layout="@layout/toolbar" />
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent" />

2
briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
View File

@@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:keepScreenOn="true">
<org.briarproject.briar.android.keyagreement.CameraView
<org.briarproject.briar.android.contact.add.nearby.CameraView
android:id="@+id/camera_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />

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

@@ -609,6 +609,9 @@
<string name="permission_camera_location_request_body">To scan the QR code, Briar needs access to the camera.\n\nTo discover Bluetooth devices, Briar needs permission to access your location.\n\nBriar does not store your location or share it with anyone.</string>
<string name="permission_camera_denied_body">You have denied access to the camera, but adding contacts requires using the camera.\n\nPlease consider granting access.</string>
<string name="permission_location_denied_body">You have denied access to your location, but Briar needs this permission to discover Bluetooth devices.\n\nPlease consider granting access.</string>
<string name="permission_location_setting_title">Location setting</string>
<string name="permission_location_setting_body">Your device\'s location setting must be turned on to find other devices via Bluetooth. Please enable location to continue. You can disable it again afterwards.</string>
<string name="permission_location_setting_button">Enable location</string>
<string name="qr_code">QR code</string>
<string name="show_qr_code_fullscreen">Show QR code fullscreen</string>