Merge branch '158-permission-requests' into 'master' (ed26ab78) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

ed26ab78

Commit ed26ab78 authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '158-permission-requests' into 'master'

Add permission requests for Android 6+

Closes #158

See merge request !601

parents 5b5b5406 8454b2d2

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/activity/RequestCodes.java 1 addition, 0 deletions

...org/briarproject/briar/android/activity/RequestCodes.java
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java 99 additions, 2 deletions

...ject/briar/android/keyagreement/KeyAgreementActivity.java
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java 3 additions, 3 deletions

...roject/briar/android/keyagreement/ShowQrCodeFragment.java
briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java 23 additions, 1 deletion

...ain/java/org/briarproject/briar/android/util/UiUtils.java
briar-android/src/main/res/values/strings.xml 6 additions, 0 deletions

briar-android/src/main/res/values/strings.xml

with 132 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment