Merge branch '348-add-hint-to-scan-both-qr-codes' into 'master'
Add hints that both users need to scan each other's QR codes/add each other's links See merge request briar/briar!1734
No related branches found
No related tags found
Showing
- briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactFragment.java 5 additions, 0 deletions.../android/contact/add/nearby/AddNearbyContactFragment.java
- briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java 4 additions, 0 deletions...riar/android/contact/add/remote/LinkExchangeFragment.java
- briar-android/src/main/java/org/briarproject/briar/android/view/InfoView.java 40 additions, 0 deletions...in/java/org/briarproject/briar/android/view/InfoView.java
- briar-android/src/main/res/layout/fragment_keyagreement_qr.xml 26 additions, 7 deletions...-android/src/main/res/layout/fragment_keyagreement_qr.xml
- briar-android/src/main/res/layout/fragment_link_exchange.xml 11 additions, 4 deletionsbriar-android/src/main/res/layout/fragment_link_exchange.xml
- briar-android/src/main/res/layout/info_view.xml 22 additions, 0 deletionsbriar-android/src/main/res/layout/info_view.xml
- briar-android/src/main/res/values/strings.xml 3 additions, 0 deletionsbriar-android/src/main/res/values/strings.xml
Loading
Please register or sign in to comment