From b467c96b794b14d2943673a9c51f40d161b93217 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Sun, 3 Apr 2016 11:24:51 +0800 Subject: [PATCH] fixing BadParcelableException --- twidere/proguard-rules.pro | 2 +- .../mariotaku/twidere/activity/AccountSelectorActivity.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/twidere/proguard-rules.pro b/twidere/proguard-rules.pro index fae9d4247..f1640ee56 100644 --- a/twidere/proguard-rules.pro +++ b/twidere/proguard-rules.pro @@ -48,4 +48,4 @@ # Fuck shitsung http://stackoverflow.com/a/34896262/859190 # ... and fuck xiaomi http://crashes.to/s/675ac9aff5e --keep class !android.support.v7.view.menu.MenuBuilder, !org.apache.commons.** { *; } +-keep class !android.support.v7.view.menu.*MenuBuilder*, !org.apache.commons.** { *; } diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/AccountSelectorActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/AccountSelectorActivity.java index da524e714..89f1ddb8b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/activity/AccountSelectorActivity.java +++ b/twidere/src/main/java/org/mariotaku/twidere/activity/AccountSelectorActivity.java @@ -41,6 +41,7 @@ import org.mariotaku.sqliteqb.library.Columns; import org.mariotaku.sqliteqb.library.Expression; import org.mariotaku.twidere.R; import org.mariotaku.twidere.adapter.AccountsAdapter; +import org.mariotaku.twidere.app.TwidereApplication; import org.mariotaku.twidere.model.ParcelableAccount; import org.mariotaku.twidere.model.ParcelableCredentials; import org.mariotaku.twidere.provider.TwidereDataStore.Accounts; @@ -238,7 +239,9 @@ public class AccountSelectorActivity extends BaseActivity implements private Intent getStartIntent() { final Intent intent = getIntent(); - return intent.getParcelableExtra(EXTRA_START_INTENT); + final Intent startIntent = intent.getParcelableExtra(EXTRA_START_INTENT); + startIntent.setExtrasClassLoader(TwidereApplication.class.getClassLoader()); + return startIntent; } }