moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Adithya Abraham Philip 2015-06-16 15:02:04 +05:30
parent 0f43d1c4bf
commit 489ddc41cd
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,8 +220,7 @@ public class HkpKeyserver extends Keyserver {
private String query(String request, Proxy proxy) throws QueryFailedException, HttpError { private String query(String request, Proxy proxy) throws QueryFailedException, HttpError {
try { try {
URL url = new URL(getUrlPrefix() + mHost + ":" + mPort + request); URL url = new URL(getUrlPrefix() + mHost + ":" + mPort + request);
Log.d(Constants.TAG, "hkp keyserver query: " + url); Log.d(Constants.TAG, "hkp keyserver query: " + url + " Proxy: " + proxy);
Log.d("PHILIP", "hkpKeyserver query(): " + proxy);
OkHttpClient client = getClient(url, proxy); OkHttpClient client = getClient(url, proxy);
Response response = client.newCall(new Request.Builder().url(url).build()).execute(); Response response = client.newCall(new Request.Builder().url(url).build()).execute();

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

@ -194,7 +194,7 @@ public class CreateKeyYubiKeyImportFragment extends Fragment implements NfcListe
} }
public void refreshSearch(ParcelableProxy parcelableProxy) { public void refreshSearch(ParcelableProxy parcelableProxy) {
// TODO: PHILIP implement proxy in YubiKey parts // TODO: PHILIP verify proxy implementation in YubiKey parts
mListFragment.loadNew(new ImportKeysListFragment.CloudLoaderState("0x" + mNfcFingerprint, mListFragment.loadNew(new ImportKeysListFragment.CloudLoaderState("0x" + mNfcFingerprint,
Preferences.getPreferences(getActivity()).getCloudSearchPrefs()), parcelableProxy); Preferences.getPreferences(getActivity()).getCloudSearchPrefs()), parcelableProxy);
} }

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

@ -48,7 +48,6 @@ import java.io.ByteArrayInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.Proxy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -187,7 +186,6 @@ public class ImportKeysListFragment extends ListFragment implements
static public class CloudLoaderState extends LoaderState { static public class CloudLoaderState extends LoaderState {
Preferences.CloudSearchPrefs mCloudPrefs; Preferences.CloudSearchPrefs mCloudPrefs;
String mServerQuery; String mServerQuery;
Proxy proxy;
CloudLoaderState(String serverQuery, Preferences.CloudSearchPrefs cloudPrefs) { CloudLoaderState(String serverQuery, Preferences.CloudSearchPrefs cloudPrefs) {
mServerQuery = serverQuery; mServerQuery = serverQuery;