Commit d9a60723 authored 3 years ago by Sebastian

Merge branch '28-tor-extras' into 'main'

Copy extras needed for TorPlugin from Briar

Closes #28

See merge request !15

parents c34a46cf 1d67a474

No related branches found

No related tags found

Checking pipeline status

Hide whitespace changes

Inline Side-by-side

Showing

.idea/codeStyles/Project.xml 69 additions, 1 deletion

.idea/codeStyles/Project.xml
mailbox-android/src/debug/assets/logback.xml 15 additions, 0 deletions

mailbox-android/src/debug/assets/logback.xml
mailbox-android/src/main/AndroidManifest.xml 3 additions, 0 deletions

mailbox-android/src/main/AndroidManifest.xml
mailbox-android/src/main/java/org/briarproject/mailbox/android/AppModule.kt 1 addition, 2 deletions

...c/main/java/org/briarproject/mailbox/android/AppModule.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxService.kt 1 addition, 2 deletions

...n/java/org/briarproject/mailbox/android/MailboxService.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/system/AndroidSystemModule.kt 0 additions, 60 deletions

...riarproject/mailbox/android/system/AndroidSystemModule.kt
mailbox-android/src/main/java/org/briarproject/mailbox/core/AndroidEagerSingletons.kt 4 additions, 0 deletions

...a/org/briarproject/mailbox/core/AndroidEagerSingletons.kt
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/AlarmConstants.java 15 additions, 0 deletions

.../org/briarproject/mailbox/core/system/AlarmConstants.java
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/AlarmReceiver.java 17 additions, 0 deletions

...a/org/briarproject/mailbox/core/system/AlarmReceiver.java
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/AndroidExecutor.java 1 addition, 1 deletion

...org/briarproject/mailbox/core/system/AndroidExecutor.java
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/AndroidExecutorImpl.java 1 addition, 3 deletions

...briarproject/mailbox/core/system/AndroidExecutorImpl.java
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/AndroidSystemModule.java 59 additions, 0 deletions

...briarproject/mailbox/core/system/AndroidSystemModule.java
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/AndroidTaskScheduler.java 231 additions, 0 deletions

...riarproject/mailbox/core/system/AndroidTaskScheduler.java
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/AndroidTaskSchedulerModule.java 37 additions, 0 deletions

...oject/mailbox/core/system/AndroidTaskSchedulerModule.java
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/AndroidWakeLock.java 1 addition, 1 deletion

...org/briarproject/mailbox/core/system/AndroidWakeLock.java
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/AndroidWakeLockImpl.java 4 additions, 5 deletions

...briarproject/mailbox/core/system/AndroidWakeLockImpl.java
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/AndroidWakeLockManager.java 1 addition, 1 deletion

...arproject/mailbox/core/system/AndroidWakeLockManager.java
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/AndroidWakeLockManagerImpl.java 7 additions, 10 deletions

...oject/mailbox/core/system/AndroidWakeLockManagerImpl.java
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/RenewableWakeLock.java 8 additions, 8 deletions

...g/briarproject/mailbox/core/system/RenewableWakeLock.java
mailbox-android/src/main/java/org/briarproject/mailbox/core/system/SharedWakeLock.java 1 addition, 3 deletions

.../org/briarproject/mailbox/core/system/SharedWakeLock.java

with 476 additions and 97 deletions

Please register or to comment