Merge branch '117-qr-contacts' into 'master'
BQP with QR codes This MR implements BQP for key agreement over short-range transports. It also implements the Android UI for using BQP with QR codes. Closes #117. See merge request !84
No related branches found
No related tags found
Showing
- briar-android/AndroidManifest.xml 12 additions, 0 deletionsbriar-android/AndroidManifest.xml
- briar-android/build.gradle 2 additions, 2 deletionsbriar-android/build.gradle
- briar-android/res/layout/activity_nav_drawer.xml 2 additions, 55 deletionsbriar-android/res/layout/activity_nav_drawer.xml
- briar-android/res/layout/activity_with_loading.xml 57 additions, 0 deletionsbriar-android/res/layout/activity_with_loading.xml
- briar-android/res/layout/fragment_keyagreement_qr.xml 59 additions, 0 deletionsbriar-android/res/layout/fragment_keyagreement_qr.xml
- briar-android/res/values/strings.xml 9 additions, 0 deletionsbriar-android/res/values/strings.xml
- briar-android/src/org/briarproject/android/AndroidComponent.java 9 additions, 0 deletions...ndroid/src/org/briarproject/android/AndroidComponent.java
- briar-android/src/org/briarproject/android/BriarFragmentActivity.java 2 additions, 1 deletion...d/src/org/briarproject/android/BriarFragmentActivity.java
- briar-android/src/org/briarproject/android/contact/ContactListFragment.java 2 additions, 2 deletions...org/briarproject/android/contact/ContactListFragment.java
- briar-android/src/org/briarproject/android/keyagreement/ChooseIdentityFragment.java 193 additions, 0 deletions...rproject/android/keyagreement/ChooseIdentityFragment.java
- briar-android/src/org/briarproject/android/keyagreement/KeyAgreementActivity.java 230 additions, 0 deletions...iarproject/android/keyagreement/KeyAgreementActivity.java
- briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java 371 additions, 0 deletions...briarproject/android/keyagreement/ShowQrCodeFragment.java
- briar-android/src/org/briarproject/android/util/CameraView.java 268 additions, 0 deletions...android/src/org/briarproject/android/util/CameraView.java
- briar-android/src/org/briarproject/android/util/PreviewConsumer.java 11 additions, 0 deletions...id/src/org/briarproject/android/util/PreviewConsumer.java
- briar-android/src/org/briarproject/android/util/QrCodeDecoder.java 100 additions, 0 deletions...roid/src/org/briarproject/android/util/QrCodeDecoder.java
- briar-android/src/org/briarproject/android/util/QrCodeUtils.java 51 additions, 0 deletions...ndroid/src/org/briarproject/android/util/QrCodeUtils.java
- briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java 90 additions, 7 deletions...org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
- briar-android/src/org/briarproject/plugins/tor/TorPlugin.java 16 additions, 0 deletions...r-android/src/org/briarproject/plugins/tor/TorPlugin.java
- briar-api/src/org/briarproject/api/contact/ContactExchangeListener.java 14 additions, 0 deletions...org/briarproject/api/contact/ContactExchangeListener.java
- briar-api/src/org/briarproject/api/contact/ContactExchangeTask.java 20 additions, 0 deletions...src/org/briarproject/api/contact/ContactExchangeTask.java
Loading
Please register or sign in to comment