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

correct keyserver preference retrieval

Browse Source
This commit is contained in:
Adithya Abraham Philip
2015-07-02 05:24:04 +05:30
parent 9fe05ed1e7
commit 3510275a7f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ import org.sufficientlysecure.keychain.ui.util.recyclerview.ItemTouchHelperViewH
import org.sufficientlysecure.keychain.ui.util.recyclerview.ItemTouchHelperDragCallback; import org.sufficientlysecure.keychain.ui.util.recyclerview.ItemTouchHelperDragCallback;
import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.ui.util.recyclerview.RecyclerItemClickListener; import org.sufficientlysecure.keychain.ui.util.recyclerview.RecyclerItemClickListener;
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.util.Preferences;
import java.util.ArrayList; import java.util.ArrayList;
@@ -83,7 +84,6 @@ public class SettingsKeyserverFragment extends Fragment implements RecyclerItemC
String keyservers[] = getArguments().getStringArray(ARG_KEYSERVER_ARRAY); String keyservers[] = getArguments().getStringArray(ARG_KEYSERVER_ARRAY);
mKeyservers = new ArrayList<>(Arrays.asList(keyservers)); mKeyservers = new ArrayList<>(Arrays.asList(keyservers));
saveKeyserverList(); // in case user does not make any changes
mAdapter = new KeyserverListAdapter(mKeyservers); mAdapter = new KeyserverListAdapter(mKeyservers);

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
View File

@@ -138,6 +138,9 @@ public class Preferences {
public String[] getKeyServers() { public String[] getKeyServers() {
String rawData = mSharedPreferences.getString(Constants.Pref.KEY_SERVERS, String rawData = mSharedPreferences.getString(Constants.Pref.KEY_SERVERS,
Constants.Defaults.KEY_SERVERS); Constants.Defaults.KEY_SERVERS);
if (rawData.equals("")) {
return new String[0];
}
Vector<String> servers = new Vector<>(); Vector<String> servers = new Vector<>();
String chunks[] = rawData.split(","); String chunks[] = rawData.split(",");
for (String c : chunks) { for (String c : chunks) {
@@ -150,7 +153,8 @@ public class Preferences {
} }
public String getPreferredKeyserver() { public String getPreferredKeyserver() {
return getKeyServers()[0]; String[] keyservers = getKeyServers();
return keyservers.length == 0 ? null : keyservers[0];
} }
public void setKeyServers(String[] value) { public void setKeyServers(String[] value) {