Merge branch '167-namespaced-settings' into 'master'
ENH: Replaces transport config with namespaced settings This MR contains the following: * Adds a new guice module: SettingsManager, that abstracts the settings interface from the underlying database * Uses SettingsManager to replace the db.getConfig/mergeConfig calls in the Settings activity * Replaces the getSettings and mergeSettings calls in the database modules to include a namespace parameter. Updates the corresponding queries in the Jdbc module * Removes the TransportConfig module, as it is not used anymore * Updates the DuplexPlugin interface, to reflect this change in schemas and calls * Updates the calls in the corresponding plugins, for both briar-android and briar-desktop * Updates the hardcoded plugins in the tests to reflect these changes and updates the unit tests. See merge request !65
Showing
- briar-android/res/values/roboguice.xml 2 additions, 1 deletionbriar-android/res/values/roboguice.xml
- briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java 1 addition, 1 deletion.../briarproject/android/AndroidNotificationManagerImpl.java
- briar-android/src/org/briarproject/android/SettingsActivity.java 13 additions, 13 deletions...ndroid/src/org/briarproject/android/SettingsActivity.java
- briar-android/src/org/briarproject/android/invitation/AddContactActivity.java 3 additions, 3 deletions...g/briarproject/android/invitation/AddContactActivity.java
- briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java 1 addition, 1 deletion...org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
- briar-android/src/org/briarproject/plugins/tor/TorPlugin.java 8 additions, 7 deletions...r-android/src/org/briarproject/plugins/tor/TorPlugin.java
- briar-api/src/org/briarproject/api/TransportConfig.java 0 additions, 16 deletionsbriar-api/src/org/briarproject/api/TransportConfig.java
- briar-api/src/org/briarproject/api/db/DatabaseComponent.java 3 additions, 13 deletionsbriar-api/src/org/briarproject/api/db/DatabaseComponent.java
- briar-api/src/org/briarproject/api/plugins/PluginCallback.java 5 additions, 5 deletions...-api/src/org/briarproject/api/plugins/PluginCallback.java
- briar-api/src/org/briarproject/api/settings/SettingsManager.java 20 additions, 0 deletions...pi/src/org/briarproject/api/settings/SettingsManager.java
- briar-core/src/org/briarproject/db/Database.java 3 additions, 20 deletionsbriar-core/src/org/briarproject/db/Database.java
- briar-core/src/org/briarproject/db/DatabaseComponentImpl.java 5 additions, 44 deletions...r-core/src/org/briarproject/db/DatabaseComponentImpl.java
- briar-core/src/org/briarproject/db/JdbcDatabase.java 14 additions, 39 deletionsbriar-core/src/org/briarproject/db/JdbcDatabase.java
- briar-core/src/org/briarproject/plugins/PluginManagerImpl.java 24 additions, 14 deletions...-core/src/org/briarproject/plugins/PluginManagerImpl.java
- briar-core/src/org/briarproject/plugins/tcp/LanTcpPlugin.java 1 addition, 1 deletion...r-core/src/org/briarproject/plugins/tcp/LanTcpPlugin.java
- briar-core/src/org/briarproject/settings/SettingsManagerImpl.java 44 additions, 0 deletions...re/src/org/briarproject/settings/SettingsManagerImpl.java
- briar-core/src/org/briarproject/settings/SettingsModule.java 13 additions, 0 deletionsbriar-core/src/org/briarproject/settings/SettingsModule.java
- briar-desktop/src/org/briarproject/plugins/modem/ModemPluginFactory.java 1 addition, 1 deletion...rc/org/briarproject/plugins/modem/ModemPluginFactory.java
- briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java 4 additions, 18 deletions...ts/src/org/briarproject/db/DatabaseComponentImplTest.java
- briar-tests/src/org/briarproject/db/H2DatabaseTest.java 13 additions, 13 deletionsbriar-tests/src/org/briarproject/db/H2DatabaseTest.java
Loading
Please register or sign in to comment