From fd5e5afc9f43c551d1ac196f47079da3f0ce4500 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Fri, 12 Sep 2014 15:49:29 +0200 Subject: Implemented Pull2Refresh in the KeyListFragment Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs Added Pull2Refresh to the KeyListFragment --- .../keychain/ui/KeyListFragment.java | 28 ++++++++++++- .../ui/widget/ListAwareSwipeRefreshLayout.java | 49 ++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ListAwareSwipeRefreshLayout.java (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui') 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 e7edc6058..065ed5841 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -35,6 +35,7 @@ import android.support.v4.content.CursorLoader; import android.support.v4.content.Loader; import android.support.v4.view.MenuItemCompat; import android.support.v4.widget.CursorAdapter; +import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.app.ActionBarActivity; import android.support.v7.widget.SearchView; import android.view.ActionMode; @@ -55,9 +56,12 @@ import android.widget.TextView; 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.pgp.KeyRing; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; +import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment; +import org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout; import org.sufficientlysecure.keychain.util.Highlighter; import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Notify; @@ -74,10 +78,11 @@ import se.emilsjolander.stickylistheaders.StickyListHeadersListView; */ public class KeyListFragment extends LoaderFragment implements SearchView.OnQueryTextListener, AdapterView.OnItemClickListener, - LoaderManager.LoaderCallbacks { + LoaderManager.LoaderCallbacks, SwipeRefreshLayout.OnRefreshListener { private KeyListAdapter mAdapter; private StickyListHeadersListView mStickyList; + private ListAwareSwipeRefreshLayout mSwipeRefreshLayout; // saves the mode object for multiselect, needed for reset at some point private ActionMode mActionMode = null; @@ -120,6 +125,15 @@ public class KeyListFragment extends LoaderFragment } }); + mSwipeRefreshLayout = (ListAwareSwipeRefreshLayout) view.findViewById(R.id.key_list_swipe_container); + mSwipeRefreshLayout.setOnRefreshListener(this); + mSwipeRefreshLayout.setColorScheme( + R.color.android_purple_dark, + R.color.android_purple_light, + R.color.android_purple_dark, + R.color.android_purple_light); + mSwipeRefreshLayout.setStickyListHeadersListView(mStickyList); + return root; } @@ -690,4 +704,16 @@ public class KeyListFragment extends LoaderFragment } + /** + * Implements OnRefreshListener for drag-to-refresh + */ + public void onRefresh() { + KeyUpdateHelper updateHelper = new KeyUpdateHelper(); + KeychainIntentServiceHandler finishedHandler = new KeychainIntentServiceHandler(getActivity()) { + public void handleMessage(Message message) { + mSwipeRefreshLayout.setRefreshing(false); + } + }; + updateHelper.updateAllKeys(getActivity(), finishedHandler); + } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ListAwareSwipeRefreshLayout.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ListAwareSwipeRefreshLayout.java new file mode 100644 index 000000000..3b6f7d7f3 --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ListAwareSwipeRefreshLayout.java @@ -0,0 +1,49 @@ +package org.sufficientlysecure.keychain.ui.widget; + +import android.content.Context; +import android.support.v4.widget.SwipeRefreshLayout; +import android.util.AttributeSet; + +import se.emilsjolander.stickylistheaders.StickyListHeadersListView; + +public class ListAwareSwipeRefreshLayout extends SwipeRefreshLayout { + + /** + * A StickyListHeadersListView whose parent view is this SwipeRefreshLayout + */ + private StickyListHeadersListView mStickyListHeadersListView; + + public ListAwareSwipeRefreshLayout(Context context) { + super(context); + } + + public ListAwareSwipeRefreshLayout(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public void setStickyListHeadersListView(StickyListHeadersListView stickyListHeadersListView) { + mStickyListHeadersListView = stickyListHeadersListView; + } + + @Override + public boolean canChildScrollUp() { + if (mStickyListHeadersListView != null) { + // In order to scroll a StickyListHeadersListView up: + // Firstly, the wrapped ListView must have at least one item + return (mStickyListHeadersListView.getListChildCount() > 0) && + // And then, the first visible item must not be the first item + ((mStickyListHeadersListView.getFirstVisiblePosition() > 0) || + // If the first visible item is the first item, + // (we've reached the first item) + // make sure that its top must not cross over the padding top of the wrapped ListView + (mStickyListHeadersListView.getListChildAt(0).getTop() < 0)); + + // If the wrapped ListView is empty or, + // the first item is located below the padding top of the wrapped ListView, + // we can allow performing refreshing now + } else { + // Fall back to default implementation + return super.canChildScrollUp(); + } + } +} \ No newline at end of file -- cgit v1.2.3 From a86ec573fab1ccd3f0ec9f86e2e0f18f7bba9382 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Sat, 13 Sep 2014 17:02:10 +0200 Subject: Removed unnecessary querying of keyservers, reimplemented the ListAwareSwipeRefreshLayout and implemented a pull-lock in case there are no keyservers --- .../keychain/ui/KeyListFragment.java | 8 +++ .../ui/widget/ListAwareSwipeRefreshLayout.java | 74 ++++++++++++++++------ 2 files changed, 61 insertions(+), 21 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui') 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 */ diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ListAwareSwipeRefreshLayout.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ListAwareSwipeRefreshLayout.java index 3b6f7d7f3..58e8e81e9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ListAwareSwipeRefreshLayout.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/ListAwareSwipeRefreshLayout.java @@ -1,49 +1,81 @@ +/* + * Copyright (C) 2014 Daniel Albert + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package org.sufficientlysecure.keychain.ui.widget; import android.content.Context; import android.support.v4.widget.SwipeRefreshLayout; import android.util.AttributeSet; +import org.sufficientlysecure.keychain.util.Log; + import se.emilsjolander.stickylistheaders.StickyListHeadersListView; public class ListAwareSwipeRefreshLayout extends SwipeRefreshLayout { + + private StickyListHeadersListView mStickyListHeadersListView = null; + private boolean mIsLocked = false; + /** - * A StickyListHeadersListView whose parent view is this SwipeRefreshLayout + * Constructors */ - private StickyListHeadersListView mStickyListHeadersListView; - public ListAwareSwipeRefreshLayout(Context context) { super(context); } - public ListAwareSwipeRefreshLayout(Context context, AttributeSet attrs) { super(context, attrs); } + /** + * Getters / Setters + */ public void setStickyListHeadersListView(StickyListHeadersListView stickyListHeadersListView) { mStickyListHeadersListView = stickyListHeadersListView; } + public StickyListHeadersListView getStickyListHeadersListView() { + return mStickyListHeadersListView; + } + + public void setIsLocked(boolean locked) { + mIsLocked = locked; + Log.d("ListAwareSwipeRefreshLayout", (mIsLocked ? "is locked" : "not locked")); + } + public boolean getIsLocked() { + return mIsLocked; + } @Override public boolean canChildScrollUp() { - if (mStickyListHeadersListView != null) { - // In order to scroll a StickyListHeadersListView up: - // Firstly, the wrapped ListView must have at least one item - return (mStickyListHeadersListView.getListChildCount() > 0) && - // And then, the first visible item must not be the first item - ((mStickyListHeadersListView.getFirstVisiblePosition() > 0) || - // If the first visible item is the first item, - // (we've reached the first item) - // make sure that its top must not cross over the padding top of the wrapped ListView - (mStickyListHeadersListView.getListChildAt(0).getTop() < 0)); - - // If the wrapped ListView is empty or, - // the first item is located below the padding top of the wrapped ListView, - // we can allow performing refreshing now - } else { - // Fall back to default implementation + if (mStickyListHeadersListView == null) return super.canChildScrollUp(); - } + + return ( + mIsLocked + || + ( + mStickyListHeadersListView.getWrappedList().getChildCount() > 0 + && + ( + mStickyListHeadersListView.getTop() > 0 + || + mStickyListHeadersListView.getFirstVisiblePosition() > 0 + ) + ) + ); } } \ No newline at end of file -- cgit v1.2.3