Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Briar Mailbox
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

193ba50d

Commit 193ba50d authored 3 years ago by Sebastian

Downloads
- Plain Diff

Merge branch '48-qr-code-encoder' into 'main'

Encode QR code for pairing

Closes #48

See merge request !35

parents 97b828ab d5a33bc7

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 9
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

mailbox-android/src/main/java/org/briarproject/mailbox/core/AndroidEagerSingletons.kt 2 additions, 2 deletions

...a/org/briarproject/mailbox/core/AndroidEagerSingletons.kt
mailbox-android/src/main/java/org/briarproject/mailbox/core/tor/AndroidTorModule.kt 1 addition, 1 deletion

...ava/org/briarproject/mailbox/core/tor/AndroidTorModule.kt
mailbox-cli/src/main/java/org/briarproject/mailbox/cli/Main.kt 24 additions, 0 deletions

...ox-cli/src/main/java/org/briarproject/mailbox/cli/Main.kt
mailbox-cli/src/main/java/org/briarproject/mailbox/cli/QrCodeRenderer.kt 20 additions, 0 deletions

.../main/java/org/briarproject/mailbox/cli/QrCodeRenderer.kt
mailbox-cli/src/main/java/org/briarproject/mailbox/core/JavaCliEagerSingletons.kt 2 additions, 2 deletions

...a/org/briarproject/mailbox/core/JavaCliEagerSingletons.kt
mailbox-cli/src/main/java/org/briarproject/mailbox/core/tor/JavaTorModule.kt 1 addition, 1 deletion

...n/java/org/briarproject/mailbox/core/tor/JavaTorModule.kt
mailbox-core/build.gradle 5 additions, 0 deletions

mailbox-core/build.gradle
mailbox-core/src/main/java/org/briarproject/mailbox/core/setup/QrCodeEncoder.kt 80 additions, 0 deletions

...java/org/briarproject/mailbox/core/setup/QrCodeEncoder.kt
mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/TorPlugin.java 13 additions, 6 deletions

...ain/java/org/briarproject/mailbox/core/tor/TorPlugin.java

with 148 additions and 12 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