cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some nullpointers from proxy implementation

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-07-07 17:45:27 +02:00
parent 64cec07b16
commit b1f5290dfa
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
View File

@@ -209,8 +209,13 @@ public class HkpKeyserver extends Keyserver {
Log.w(Constants.TAG, e); Log.w(Constants.TAG, e);
} }
client.setProxy(proxy); if (proxy != null) {
client.setConnectTimeout(proxy != null ? 30000 : 5000, TimeUnit.MILLISECONDS); client.setProxy(proxy);
client.setConnectTimeout(30000, TimeUnit.MILLISECONDS);
} else {
client.setProxy(Proxy.NO_PROXY);
client.setConnectTimeout(5000, TimeUnit.MILLISECONDS);
}
client.setReadTimeout(45000, TimeUnit.MILLISECONDS); client.setReadTimeout(45000, TimeUnit.MILLISECONDS);
return client; return client;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java
View File

@@ -103,7 +103,7 @@ public class ImportKeysListCloudLoader
ArrayList<ImportKeysListEntry> searchResult = CloudSearch.search( ArrayList<ImportKeysListEntry> searchResult = CloudSearch.search(
mServerQuery, mServerQuery,
mCloudPrefs, mCloudPrefs,
mParcelableProxy.getProxy() mParcelableProxy != null ? mParcelableProxy.getProxy() : null
); );
mEntryList.clear(); mEntryList.clear();