Merge branch 'extend-expiry' into 'master' (cee4e130) · 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

cee4e130

Commit cee4e130 authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch 'extend-expiry' into 'master'

Extend expiry and show a green snackbar about it once

See merge request !606

parents 13d35229 a1f989c4

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/BriarApplication.java 2 additions, 2 deletions

...java/org/briarproject/briar/android/BriarApplication.java
briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java 32 additions, 13 deletions

...iarproject/briar/android/navdrawer/NavDrawerActivity.java
briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerController.java 3 additions, 1 deletion

...rproject/briar/android/navdrawer/NavDrawerController.java
briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java 18 additions, 10 deletions

...ject/briar/android/navdrawer/NavDrawerControllerImpl.java
briar-android/src/main/res/values/strings.xml 1 addition, 0 deletions

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

with 56 additions and 26 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