From 2771ac7ae9ca217f9396078ec327cfa89643adcf Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Tue, 3 Apr 2018 16:25:07 +0900 Subject: [PATCH] Fix assertion failures caused by different instance type onAttachFragment() with ReportFragment instance is called first since Support Library 26.1.0 has been applied. Remove assert() and check instance to fix crash caused by the ReportFragement. Test: Manual Change-Id: I5a4d6bdd00ac94c5892527f5fe784b8f19701214 Signed-off-by: Taesu Lee --- .../messaging/ui/BlockedParticipantsActivity.java | 7 ------- .../android/messaging/ui/VCardDetailActivity.java | 12 +++++++----- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/com/android/messaging/ui/BlockedParticipantsActivity.java b/src/com/android/messaging/ui/BlockedParticipantsActivity.java index b740264..8d79155 100644 --- a/src/com/android/messaging/ui/BlockedParticipantsActivity.java +++ b/src/com/android/messaging/ui/BlockedParticipantsActivity.java @@ -16,12 +16,10 @@ package com.android.messaging.ui; -import android.app.Fragment; import android.os.Bundle; import android.view.MenuItem; import com.android.messaging.R; -import com.android.messaging.util.Assert; /** * Show a list of currently blocked participants. @@ -36,11 +34,6 @@ public class BlockedParticipantsActivity extends BugleActionBarActivity { getSupportActionBar().setDisplayHomeAsUpEnabled(true); } - @Override - public void onAttachFragment(final Fragment fragment) { - Assert.isTrue(fragment instanceof BlockedParticipantsFragment); - } - @Override public boolean onOptionsItemSelected(final MenuItem item) { switch (item.getItemId()) { diff --git a/src/com/android/messaging/ui/VCardDetailActivity.java b/src/com/android/messaging/ui/VCardDetailActivity.java index fecdc34..b9fb3d1 100644 --- a/src/com/android/messaging/ui/VCardDetailActivity.java +++ b/src/com/android/messaging/ui/VCardDetailActivity.java @@ -37,11 +37,13 @@ public class VCardDetailActivity extends BugleActionBarActivity { @Override public void onAttachFragment(final Fragment fragment) { - Assert.isTrue(fragment instanceof VCardDetailFragment); - final Uri vCardUri = getIntent().getParcelableExtra(UIIntents.UI_INTENT_EXTRA_VCARD_URI); - Assert.notNull(vCardUri); - final VCardDetailFragment vCardDetailFragment = (VCardDetailFragment) fragment; - vCardDetailFragment.setVCardUri(vCardUri); + if (fragment instanceof VCardDetailFragment) { + final Uri vCardUri = + getIntent().getParcelableExtra(UIIntents.UI_INTENT_EXTRA_VCARD_URI); + Assert.notNull(vCardUri); + final VCardDetailFragment vCardDetailFragment = (VCardDetailFragment) fragment; + vCardDetailFragment.setVCardUri(vCardUri); + } } @Override