Pull-Merge of latest changes from main repo (85115104) · Commits · Julian Dehm / briar

Commit 85115104 authored 10 years ago by Abraham Kiggundu

Browse files

Pull-Merge of latest changes from main repo

parents 8d25840a 4e57029d

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/strings.xml 2 additions, 2 deletions

briar-android/res/values/strings.xml
briar-android/src/org/briarproject/android/PasswordActivity.java 1 addition, 4 deletions

...ndroid/src/org/briarproject/android/PasswordActivity.java
briar-android/src/org/briarproject/android/SetupActivity.java 8 additions, 27 deletions

...r-android/src/org/briarproject/android/SetupActivity.java
briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java 10 additions, 10 deletions

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

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

...ect/plugins/droidtooth/DroidtoothTransportConnection.java
briar-android/src/org/briarproject/plugins/tcp/AndroidLanTcpPlugin.java 3 additions, 4 deletions

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

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

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

...id/src/org/briarproject/plugins/tor/TorPluginFactory.java
briar-android/src/org/briarproject/plugins/tor/TorTransportConnection.java 4 additions, 8 deletions

.../org/briarproject/plugins/tor/TorTransportConnection.java
briar-api/src/org/briarproject/api/crypto/AuthenticatedCipher.java 3 additions, 3 deletions

.../src/org/briarproject/api/crypto/AuthenticatedCipher.java
briar-api/src/org/briarproject/api/crypto/CryptoComponent.java 3 additions, 3 deletions

...-api/src/org/briarproject/api/crypto/CryptoComponent.java
briar-api/src/org/briarproject/api/crypto/KeyManager.java 2 additions, 5 deletions

briar-api/src/org/briarproject/api/crypto/KeyManager.java
briar-api/src/org/briarproject/api/crypto/PasswordStrengthEstimator.java 1 addition, 1 deletion

...rg/briarproject/api/crypto/PasswordStrengthEstimator.java
briar-api/src/org/briarproject/api/crypto/SecretKey.java 8 additions, 14 deletions

briar-api/src/org/briarproject/api/crypto/SecretKey.java
briar-api/src/org/briarproject/api/crypto/StreamDecrypter.java 14 additions, 0 deletions

...-api/src/org/briarproject/api/crypto/StreamDecrypter.java
briar-api/src/org/briarproject/api/crypto/StreamDecrypterFactory.java 17 additions, 0 deletions

...c/org/briarproject/api/crypto/StreamDecrypterFactory.java
briar-api/src/org/briarproject/api/crypto/StreamEncrypter.java 13 additions, 0 deletions

...-api/src/org/briarproject/api/crypto/StreamEncrypter.java
briar-api/src/org/briarproject/api/crypto/StreamEncrypterFactory.java 17 additions, 0 deletions

...c/org/briarproject/api/crypto/StreamEncrypterFactory.java

with 134 additions and 111 deletions

Please register or to comment