Merge branch '1224-show-explanation-when-contact-exchange-fails' into 'master'
Show an error fragment when contact exchange fails See merge request briar/briar!890
No related branches found
No related tags found
Showing
- bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java 1 addition, 0 deletions...iarproject/bramble/keyagreement/KeyAgreementTaskImpl.java
- briar-android/artwork/qr_code_error.svg 52 additions, 0 deletionsbriar-android/artwork/qr_code_error.svg
- briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java 3 additions, 0 deletions...riarproject/briar/android/activity/ActivityComponent.java
- briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java 8 additions, 18 deletions...t/briar/android/keyagreement/ContactExchangeActivity.java
- briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeErrorFragment.java 87 additions, 0 deletions...ar/android/keyagreement/ContactExchangeErrorFragment.java
- briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java 9 additions, 1 deletion...ject/briar/android/keyagreement/KeyAgreementActivity.java
- briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java 4 additions, 8 deletions...ject/briar/android/keyagreement/KeyAgreementFragment.java
- briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java 2 additions, 8 deletions...briarproject/briar/android/settings/SettingsFragment.java
- briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java 35 additions, 0 deletions...ain/java/org/briarproject/briar/android/util/UiUtils.java
- briar-android/src/main/res/drawable/qr_code_error.xml 23 additions, 0 deletionsbriar-android/src/main/res/drawable/qr_code_error.xml
- briar-android/src/main/res/layout/fragment_error_contact_exchange.xml 109 additions, 0 deletions...d/src/main/res/layout/fragment_error_contact_exchange.xml
- briar-android/src/main/res/values/strings.xml 3 additions, 4 deletionsbriar-android/src/main/res/values/strings.xml
Loading
Please register or sign in to comment