aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
diff options
context:
space:
mode:
authorDaniel Albert <albert_daniel@t-online.de>2014-09-13 17:02:10 +0200
committerDaniel Albert <albert_daniel@t-online.de>2014-09-13 17:02:10 +0200
commita86ec573fab1ccd3f0ec9f86e2e0f18f7bba9382 (patch)
treebe392c9646f81a7a1b61f3896a3d728483ff7449 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
parentfd5e5afc9f43c551d1ac196f47079da3f0ce4500 (diff)
downloadopen-keychain-a86ec573fab1ccd3f0ec9f86e2e0f18f7bba9382.tar.gz
open-keychain-a86ec573fab1ccd3f0ec9f86e2e0f18f7bba9382.tar.bz2
open-keychain-a86ec573fab1ccd3f0ec9f86e2e0f18f7bba9382.zip
Removed unnecessary querying of keyservers, reimplemented the ListAwareSwipeRefreshLayout and implemented a pull-lock in case there are no keyservers
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 065ed5841..4fda4cede 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -57,6 +57,7 @@ import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.helper.ExportHelper;
import org.sufficientlysecure.keychain.helper.KeyUpdateHelper;
+import org.sufficientlysecure.keychain.helper.Preferences;
import org.sufficientlysecure.keychain.pgp.KeyRing;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
@@ -137,6 +138,13 @@ public class KeyListFragment extends LoaderFragment
return root;
}
+ @Override
+ public void onResume() {
+ String[] servers = Preferences.getPreferences(getActivity()).getKeyServers();
+ mSwipeRefreshLayout.setIsLocked(servers == null || servers.length == 0 || servers[0] == null);
+ super.onResume();
+ }
+
/**
* Define Adapter and Loader on create of Activity
*/