Merge branch 'simpler-threading'. (6a4ea497) · Commits · Julian Dehm / briar

Commit 6a4ea497 authored 10 years ago by akwizgran

Merge branch 'simpler-threading'.

This merge reduces the number of thread pools.

parents d406853f f9a6c46e

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/res/values/roboguice.xml 0 additions, 1 deletion

briar-android/res/values/roboguice.xml
briar-android/src/org/briarproject/android/AndroidModule.java 2 additions, 24 deletions

...r-android/src/org/briarproject/android/AndroidModule.java
briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java 5 additions, 5 deletions

.../briarproject/android/AndroidNotificationManagerImpl.java
briar-android/src/org/briarproject/android/BriarActivity.java 7 additions, 3 deletions

...r-android/src/org/briarproject/android/BriarActivity.java
briar-android/src/org/briarproject/android/BriarService.java 4 additions, 3 deletions

briar-android/src/org/briarproject/android/BriarService.java
briar-android/src/org/briarproject/android/SplashScreenActivity.java 2 additions, 2 deletions

...id/src/org/briarproject/android/SplashScreenActivity.java
briar-android/src/org/briarproject/plugins/AndroidPluginsModule.java 9 additions, 15 deletions

...id/src/org/briarproject/plugins/AndroidPluginsModule.java
briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java 5 additions, 5 deletions

...org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPluginFactory.java 4 additions, 4 deletions

...arproject/plugins/droidtooth/DroidtoothPluginFactory.java
briar-android/src/org/briarproject/plugins/tcp/AndroidLanTcpPlugin.java 2 additions, 2 deletions

...src/org/briarproject/plugins/tcp/AndroidLanTcpPlugin.java
briar-android/src/org/briarproject/plugins/tcp/AndroidLanTcpPluginFactory.java 4 additions, 5 deletions

.../briarproject/plugins/tcp/AndroidLanTcpPluginFactory.java
briar-android/src/org/briarproject/plugins/tor/TorPlugin.java 6 additions, 6 deletions

...r-android/src/org/briarproject/plugins/tor/TorPlugin.java
briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java 5 additions, 5 deletions

...id/src/org/briarproject/plugins/tor/TorPluginFactory.java
briar-api/src/org/briarproject/api/android/DatabaseUiExecutor.java 0 additions, 19 deletions

.../src/org/briarproject/api/android/DatabaseUiExecutor.java
briar-api/src/org/briarproject/api/lifecycle/IoExecutor.java 3 additions, 3 deletions

briar-api/src/org/briarproject/api/lifecycle/IoExecutor.java
briar-api/src/org/briarproject/api/reliability/ReliabilityExecutor.java 0 additions, 17 deletions

...org/briarproject/api/reliability/ReliabilityExecutor.java
briar-api/src/org/briarproject/api/transport/IncomingConnectionExecutor.java 0 additions, 19 deletions

...riarproject/api/transport/IncomingConnectionExecutor.java
briar-core/src/org/briarproject/db/Database.java 98 additions, 109 deletions

briar-core/src/org/briarproject/db/Database.java
briar-core/src/org/briarproject/db/DatabaseComponentImpl.java 610 additions, 1011 deletions

...r-core/src/org/briarproject/db/DatabaseComponentImpl.java
briar-core/src/org/briarproject/db/DatabaseModule.java 3 additions, 6 deletions

briar-core/src/org/briarproject/db/DatabaseModule.java

with 769 additions and 1264 deletions

Please register or to comment