From 717d66961b0665d6a2fd5f81a43ff0f19ebc8343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 20 Jun 2014 15:39:27 +0200 Subject: Fix onTouchEvent delegation, with workaround for Android bug --- .../sufficientlysecure/keychain/ui/ImportKeysActivity.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 07587b599..8f3851e84 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -28,7 +28,6 @@ import android.os.Bundle; import android.os.Message; import android.os.Messenger; import android.os.Parcelable; -import android.support.v4.app.Fragment; import android.support.v4.view.ViewPager; import android.support.v7.app.ActionBarActivity; import android.view.MotionEvent; @@ -88,8 +87,6 @@ public class ImportKeysActivity extends ActionBarActivity { // view private ImportKeysListFragment mListFragment; - private String[] mNavigationStrings; - private Fragment mCurrentFragment; private View mImportButton; private ViewPager mViewPager; private SlidingTabLayout mSlidingTabLayout; @@ -121,8 +118,6 @@ public class ImportKeysActivity extends ActionBarActivity { } }); - mNavigationStrings = getResources().getStringArray(R.array.import_action_list); - // TODO: add actionbar button for this action? // if (ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN.equals(getIntent().getAction())) { // } @@ -373,7 +368,13 @@ public class ImportKeysActivity extends ActionBarActivity { boolean result = super.onTouchEvent(event); if (!result) { - mViewPager.onTouchEvent(event); + try { + mViewPager.onTouchEvent(event); + } catch (IllegalArgumentException e) { + // workaround for Android bug? + // http://stackoverflow.com/q/16459196 + Log.d(Constants.TAG, "Workaround: Catched IllegalArgumentException"); + } } return result; -- cgit v1.2.3