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

added proxy support to YubiKey search

Browse Source
This commit is contained in:
Adithya Abraham Philip
2015-06-16 15:00:24 +05:30
parent 2402c6d3c7
commit ab5763e2fa
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java
View File

@@ -145,7 +145,18 @@ public class CreateYubiKeyImportFragment
view.findViewById(R.id.button_search).setOnClickListener(new OnClickListener() { view.findViewById(R.id.button_search).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
refreshSearch(); final Preferences.ProxyPrefs proxyPrefs = Preferences.getPreferences(getActivity()).getProxyPrefs();
Runnable ignoreTor = new Runnable() {
@Override
public void run() {
refreshSearch(new ParcelableProxy(null, -1, null));
}
};
if (OrbotHelper.isOrbotInRequiredState(R.string.orbot_ignore_tor, ignoreTor, proxyPrefs,
getActivity())) {
refreshSearch(proxyPrefs.parcelableProxy);
}
} }
}); });
@@ -184,10 +195,10 @@ public class CreateYubiKeyImportFragment
} }
} }
public void refreshSearch() { public void refreshSearch(ParcelableProxy parcelableProxy) {
// TODO: PHILIP implement proxy in YubiKey parts // TODO: PHILIP implement proxy in YubiKey parts
mListFragment.loadNew(new ImportKeysListFragment.CloudLoaderState("0x" + mNfcFingerprint, mListFragment.loadNew(new ImportKeysListFragment.CloudLoaderState("0x" + mNfcFingerprint,
Preferences.getPreferences(getActivity()).getCloudSearchPrefs()), null); Preferences.getPreferences(getActivity()).getCloudSearchPrefs()), parcelableProxy);
} }
public void importKey(ParcelableProxy parcelableProxy) { public void importKey(ParcelableProxy parcelableProxy) {
@@ -225,7 +236,20 @@ public class CreateYubiKeyImportFragment
public void onNfcPostExecute() throws IOException { public void onNfcPostExecute() throws IOException {
setData(); setData();
refreshSearch();
Preferences.ProxyPrefs proxyPrefs = Preferences.getPreferences(getActivity()).getProxyPrefs();
Runnable ignoreTor = new Runnable() {
@Override
public void run() {
refreshSearch(new ParcelableProxy(null, -1, null));
}
};
if (OrbotHelper.isOrbotInRequiredState(R.string.orbot_ignore_tor, ignoreTor, proxyPrefs,
getActivity())) {
refreshSearch(proxyPrefs.parcelableProxy);
}
} }
@Override @Override