Merge branch 'remove-old-bluetooth-code' into 'master' (ed01048f) · Commits · Julian Dehm / briar

Commit ed01048f authored 7 years ago by Torsten Grote

Merge branch 'remove-old-bluetooth-code' into 'master'

Remove old Bluetooth code and location permission

See merge request !584

parents 043ee3c5 d24b1884

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java 1 addition, 210 deletions

...arproject/bramble/plugin/droidtooth/DroidtoothPlugin.java
bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java 0 additions, 12 deletions

...n/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java 0 additions, 11 deletions

.../org/briarproject/bramble/api/crypto/CryptoComponent.java
bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PseudoRandom.java 0 additions, 12 deletions

...ava/org/briarproject/bramble/api/crypto/PseudoRandom.java
bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypterFactory.java 3 additions, 2 deletions

...iarproject/bramble/api/crypto/StreamDecrypterFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypterFactory.java 3 additions, 2 deletions

...iarproject/bramble/api/crypto/StreamEncrypterFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/invitation/InvitationConstants.java 0 additions, 20 deletions

...arproject/bramble/api/invitation/InvitationConstants.java
bramble-api/src/main/java/org/briarproject/bramble/api/invitation/InvitationListener.java 0 additions, 47 deletions

...iarproject/bramble/api/invitation/InvitationListener.java
bramble-api/src/main/java/org/briarproject/bramble/api/invitation/InvitationState.java 0 additions, 85 deletions

.../briarproject/bramble/api/invitation/InvitationState.java
bramble-api/src/main/java/org/briarproject/bramble/api/invitation/InvitationTask.java 0 additions, 38 deletions

...g/briarproject/bramble/api/invitation/InvitationTask.java
bramble-api/src/main/java/org/briarproject/bramble/api/invitation/InvitationTaskFactory.java 0 additions, 15 deletions

...project/bramble/api/invitation/InvitationTaskFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/PluginManager.java 0 additions, 5 deletions

...va/org/briarproject/bramble/api/plugin/PluginManager.java
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java 0 additions, 15 deletions

.../briarproject/bramble/api/plugin/duplex/DuplexPlugin.java
bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamReaderFactory.java 3 additions, 3 deletions

...iarproject/bramble/api/transport/StreamReaderFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamWriterFactory.java 3 additions, 3 deletions

...iarproject/bramble/api/transport/StreamWriterFactory.java
bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java 0 additions, 2 deletions

...main/java/org/briarproject/bramble/BrambleCoreModule.java
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeTaskImpl.java 3 additions, 3 deletions

...briarproject/bramble/contact/ContactExchangeTaskImpl.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java 0 additions, 27 deletions

.../org/briarproject/bramble/crypto/CryptoComponentImpl.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamDecrypterFactoryImpl.java 1 addition, 1 deletion

...iarproject/bramble/crypto/StreamDecrypterFactoryImpl.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterFactoryImpl.java 2 additions, 2 deletions

...iarproject/bramble/crypto/StreamEncrypterFactoryImpl.java

with 19 additions and 515 deletions

Please register or to comment