diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-08-10 06:17:29 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-08-20 21:02:29 +0530 |
commit | 65a993446c8905ca5e77fefe4b7f1c4d0aee74d8 (patch) | |
tree | 537883b8c00119af5ee248079ce5d80f88ea1c2e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | |
parent | 448657602ce5baa5b2a99e26ab2eb2fb8061778f (diff) | |
download | open-keychain-65a993446c8905ca5e77fefe4b7f1c4d0aee74d8.tar.gz open-keychain-65a993446c8905ca5e77fefe4b7f1c4d0aee74d8.tar.bz2 open-keychain-65a993446c8905ca5e77fefe4b7f1c4d0aee74d8.zip |
reworked keyserversyncadapterservice flow
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.java | 33 |
1 files changed, 10 insertions, 23 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 4997d3fab..9630463fc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -18,13 +18,9 @@ package org.sufficientlysecure.keychain.ui; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; - import android.animation.ObjectAnimator; import android.annotation.TargetApi; +import android.app.Activity; import android.content.Context; import android.content.Intent; import android.database.Cursor; @@ -64,13 +60,14 @@ import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.KeychainDatabase; +import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.service.ConsolidateInputParcel; import org.sufficientlysecure.keychain.service.ImportKeyringParcel; import org.sufficientlysecure.keychain.service.KeyserverSyncAdapterService; -import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; import org.sufficientlysecure.keychain.ui.adapter.KeyAdapter; import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper; import org.sufficientlysecure.keychain.ui.util.FormattingUtils; +import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.util.FabContainer; import org.sufficientlysecure.keychain.util.Log; @@ -78,6 +75,10 @@ import org.sufficientlysecure.keychain.util.Preferences; import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter; import se.emilsjolander.stickylistheaders.StickyListHeadersListView; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; + /** * Public key list with sticky list headers. It does _not_ extend ListFragment because it uses * StickyListHeaders library which does not extend upon ListView. @@ -520,9 +521,7 @@ public class KeyListFragment extends LoaderFragment } private void updateAllKeys() { - // TODO: PHILIP just for testing, remove! - KeyserverSyncAdapterService.updateKeysFromKeyserver(getActivity(), new CryptoInputParcel()); - /*Activity activity = getActivity(); + Activity activity = getActivity(); if (activity == null) { return; } @@ -536,7 +535,7 @@ public class KeyListFragment extends LoaderFragment ); if (cursor == null) { - Notify.create(activity, R.string.error_loading_keys, Style.ERROR); + Notify.create(activity, R.string.error_loading_keys, Notify.Style.ERROR); return; } @@ -563,7 +562,7 @@ public class KeyListFragment extends LoaderFragment mImportOpHelper = new CryptoOperationHelper<>(1, this, this, R.string.progress_updating); - mImportOpHelper.cryptoOperation();*/ + mImportOpHelper.cryptoOperation(); } private void consolidate() { @@ -648,18 +647,6 @@ public class KeyListFragment extends LoaderFragment } @Override - public void onResume() { - super.onResume(); - KeyserverSyncAdapterService.preventAndCancelUpdates(); - } - - @Override - public void onPause() { - super.onPause(); - KeyserverSyncAdapterService.allowUpdates(); - } - - @Override public void fabMoveUp(int height) { ObjectAnimator anim = ObjectAnimator.ofFloat(mFab, "translationY", 0, -height); // we're a little behind, so skip 1/10 of the time |