diff options
Diffstat (limited to 'OpenKeychain')
3 files changed, 24 insertions, 28 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index aee9b2311..306cb8195 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -12,16 +12,16 @@ dependencies { compile 'com.android.support:appcompat-v7:19.0.1' compile project(':OpenKeychain-API:libraries:openpgp-api-library') compile project(':OpenKeychain-API:libraries:openkeychain-api-library') - compile project(':libraries:HtmlTextView') - compile project(':libraries:StickyListHeaders:library') - compile project(':libraries:AndroidBootstrap') - compile project(':libraries:zxing') - compile project(':libraries:zxing-android-integration') - compile project(':libraries:spongycastle:core') - compile project(':libraries:spongycastle:pg') - compile project(':libraries:spongycastle:pkix') - compile project(':libraries:spongycastle:prov') - compile project(':libraries:Android-AppMsg:library') + compile project(':extern:html-textview') + compile project(':extern:StickyListHeaders:library') + compile project(':extern:AndroidBootstrap:AndroidBootstrap') + compile project(':extern:zxing-qr-code') + compile project(':extern:zxing-android-integration') + compile project(':extern:spongycastle:core') + compile project(':extern:spongycastle:pg') + compile project(':extern:spongycastle:pkix') + compile project(':extern:spongycastle:prov') + compile project(':extern:AppMsg:library') // Dependencies for the `testLocal` task, make sure to list all your global dependencies here as well testLocalCompile 'junit:junit:4.11' @@ -31,16 +31,16 @@ dependencies { testLocalCompile 'com.android.support:appcompat-v7:19.0.1' testLocalCompile project(':OpenKeychain-API:libraries:openpgp-api-library') testLocalCompile project(':OpenKeychain-API:libraries:openkeychain-api-library') - testLocalCompile project(':libraries:HtmlTextView') - testLocalCompile project(':libraries:StickyListHeaders:library') - testLocalCompile project(':libraries:AndroidBootstrap') - testLocalCompile project(':libraries:zxing') - testLocalCompile project(':libraries:zxing-android-integration') - testLocalCompile project(':libraries:spongycastle:core') - testLocalCompile project(':libraries:spongycastle:pg') - testLocalCompile project(':libraries:spongycastle:pkix') - testLocalCompile project(':libraries:spongycastle:prov') - testLocalCompile project(':libraries:Android-AppMsg:library') + testLocalCompile project(':extern:html-textview') + testLocalCompile project(':extern:StickyListHeaders:library') + testLocalCompile project(':extern:AndroidBootstrap:AndroidBootstrap') + testLocalCompile project(':extern:zxing-qr-code') + testLocalCompile project(':extern:zxing-android-integration') + testLocalCompile project(':extern:spongycastle:core') + testLocalCompile project(':extern:spongycastle:pg') + testLocalCompile project(':extern:spongycastle:pkix') + testLocalCompile project(':extern:spongycastle:prov') + testLocalCompile project(':extern:AppMsg:library') } android { 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 2cc3396ec..5024a17ed 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -69,7 +69,6 @@ import org.sufficientlysecure.keychain.util.Log; import java.util.Date; import java.util.HashMap; -import se.emilsjolander.stickylistheaders.ApiLevelTooLowException; import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter; import se.emilsjolander.stickylistheaders.StickyListHeadersListView; @@ -150,16 +149,14 @@ public class KeyListFragment extends Fragment mStickyList.setAreHeadersSticky(true); mStickyList.setDrawingListUnderStickyHeader(false); mStickyList.setFastScrollEnabled(true); - try { - mStickyList.setFastScrollAlwaysVisible(true); - } catch (ApiLevelTooLowException e) { - } /* * ActionBarSherlock does not support MultiChoiceModeListener. Thus multi-selection is only * available for Android >= 3.0 */ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + mStickyList.setFastScrollAlwaysVisible(true); + mStickyList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL); mStickyList.getWrappedList().setMultiChoiceModeListener(new MultiChoiceModeListener() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java index b738970f1..5418f4033 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.LoaderManager; @@ -41,7 +42,6 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.Certs; import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables; import org.sufficientlysecure.keychain.util.Log; -import se.emilsjolander.stickylistheaders.ApiLevelTooLowException; import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter; import se.emilsjolander.stickylistheaders.StickyListHeadersListView; @@ -100,9 +100,8 @@ public class ViewKeyCertsFragment extends Fragment mStickyList.setFastScrollEnabled(true); mStickyList.setOnItemClickListener(this); - try { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { mStickyList.setFastScrollAlwaysVisible(true); - } catch (ApiLevelTooLowException e) { } mStickyList.setEmptyView(getActivity().findViewById(R.id.empty)); |