Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

Companion App Android
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

e3ffecbd

Commit e3ffecbd authored 5 years ago by Anon

Downloads
- Plain Diff

Merge branch 'connection-manager' into 'master'

Use first bonded card10 in ConnectionService.

See merge request card10/companion-app-android!7

parents 8e7a0fba 7c3a6a68

No related branches found

No related tags found

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

app/src/main/java/de/ccc/events/badge/card10/common/ConnectionException.kt 30 additions, 0 deletions

.../de/ccc/events/badge/card10/common/ConnectionException.kt
app/src/main/java/de/ccc/events/badge/card10/common/ConnectionService.kt 17 additions, 4 deletions

...va/de/ccc/events/badge/card10/common/ConnectionService.kt
app/src/main/java/de/ccc/events/badge/card10/filetransfer/FileTransferFragment.kt 3 additions, 6 deletions

.../events/badge/card10/filetransfer/FileTransferFragment.kt
app/src/main/res/values/strings.xml 3 additions, 0 deletions

app/src/main/res/values/strings.xml

with 53 additions and 10 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