Merge branch 'setting-to-disable-tor' into 'master'
Add a setting to disable Tor See merge request !489
Showing
- bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java 2 additions, 1 deletion...arproject/bramble/plugin/droidtooth/DroidtoothPlugin.java
- bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java 14 additions, 5 deletions...n/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
- bramble-api/src/main/java/org/briarproject/bramble/api/plugin/BluetoothConstants.java 1 addition, 0 deletions...g/briarproject/bramble/api/plugin/BluetoothConstants.java
- bramble-api/src/main/java/org/briarproject/bramble/api/plugin/LanTcpConstants.java 1 addition, 0 deletions.../org/briarproject/bramble/api/plugin/LanTcpConstants.java
- bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java 7 additions, 0 deletions...ava/org/briarproject/bramble/api/plugin/TorConstants.java
- bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java 6 additions, 5 deletions...ava/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java
- briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java 23 additions, 21 deletions...project/briar/android/AndroidNotificationManagerImpl.java
- briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java 66 additions, 49 deletions...briarproject/briar/android/settings/SettingsFragment.java
- briar-android/src/main/java/org/briarproject/briar/api/android/AndroidNotificationManager.java 10 additions, 0 deletions...project/briar/api/android/AndroidNotificationManager.java
- briar-android/src/main/res/values/arrays.xml 9 additions, 3 deletionsbriar-android/src/main/res/values/arrays.xml
- briar-android/src/main/res/values/strings.xml 4 additions, 3 deletionsbriar-android/src/main/res/values/strings.xml
- briar-android/src/main/res/xml/settings.xml 5 additions, 5 deletionsbriar-android/src/main/res/xml/settings.xml
Loading
Please register or sign in to comment