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;
diff --git a/OpenKeychain/src/main/res/values/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml
index 699c02aff..44bbe00cc 100644
--- a/OpenKeychain/src/main/res/values/arrays.xml
+++ b/OpenKeychain/src/main/res/values/arrays.xml
@@ -48,13 +48,5 @@
- @string/key_size_1024
- @string/key_size_custom
-
- - @string/menu_import_from_key_server
- - @string/menu_import_from_file
- - @string/menu_import_from_qr_code
- - @string/import_from_clipboard
- - @string/menu_import_from_nfc
- - @string/menu_import_from_keybase
-