From 3d613bb6c9ef687dccf2b0780142c0d8a1167e2e Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Fri, 29 May 2020 14:10:59 -0400 Subject: [PATCH] Only show Bubbles link for messaging apps Apps that have sent at least one valid conversation Test: manual, atest Fixes: 156033178 Change-Id: If4fff6810f2e390ba0ad0f7587b8d8c2d5819c93 --- res/xml/app_notification_settings.xml | 10 ++--- .../AppBubbleListPreferenceController.java | 13 ++++++- .../notification/NotificationBackend.java | 9 +++++ ...pConversationListPreferenceController.java | 7 ++-- .../BubbleSummaryPreferenceController.java | 4 +- ...BubbleSummaryPreferenceControllerTest.java | 37 ++++++++++++------- 6 files changed, 55 insertions(+), 25 deletions(-) diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml index 8ca4e0ddda1..b3a11173821 100644 --- a/res/xml/app_notification_settings.xml +++ b/res/xml/app_notification_settings.xml @@ -37,12 +37,12 @@ android:visibility="gone" settings:allowDividerAbove="false" settings:allowDividerBelow="false"> - - + + mConversations = new ArrayList<>(); protected PreferenceCategory mPreference; - private boolean mIsInInvalidMsgState; public AppConversationListPreferenceController(Context context, NotificationBackend backend) { super(context, backend); @@ -71,7 +70,8 @@ public class AppConversationListPreferenceController extends NotificationPrefere return false; } } - return true; + return mBackend.hasSentValidMsg(mAppRow.pkg, mAppRow.uid) || mBackend.isInInvalidMsgState( + mAppRow.pkg, mAppRow.uid); } @Override @@ -88,7 +88,6 @@ public class AppConversationListPreferenceController extends NotificationPrefere new AsyncTask() { @Override protected Void doInBackground(Void... unused) { - mIsInInvalidMsgState = mBackend.isInInvalidMsgState(mAppRow.pkg, mAppRow.uid); ParceledListSlice list = mBackend.getConversations(mAppRow.pkg, mAppRow.uid); if (list != null) { @@ -122,7 +121,7 @@ public class AppConversationListPreferenceController extends NotificationPrefere return; } - if (!mIsInInvalidMsgState && !mConversations.isEmpty()) { + if (!mConversations.isEmpty()) { // TODO: if preference has children, compare with newly loaded list mPreference.removeAll(); mPreference.setTitle(getTitleResId()); diff --git a/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java b/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java index 06c6f3a1a84..7519c23c9fa 100644 --- a/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java +++ b/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java @@ -49,7 +49,7 @@ public class BubbleSummaryPreferenceController extends NotificationPreferenceCon if (!super.isAvailable()) { return false; } - if (mAppRow == null && mChannel == null) { + if (mAppRow == null) { return false; } if (mChannel != null) { @@ -62,7 +62,7 @@ public class BubbleSummaryPreferenceController extends NotificationPreferenceCon return mAppRow != null; } } - return isGloballyEnabled(); + return isGloballyEnabled() && mBackend.hasSentValidMsg(mAppRow.pkg, mAppRow.uid); } @Override diff --git a/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java index 9d664ac02c8..af7b1085cb4 100644 --- a/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java @@ -31,6 +31,8 @@ import static junit.framework.TestCase.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -59,6 +61,7 @@ public class BubbleSummaryPreferenceControllerTest { private Context mContext; @Mock private NotificationBackend mBackend; + NotificationBackend.AppRow mAppRow; private BubbleSummaryPreferenceController mController; @@ -67,6 +70,10 @@ public class BubbleSummaryPreferenceControllerTest { MockitoAnnotations.initMocks(this); ShadowApplication shadowApplication = ShadowApplication.getInstance(); mContext = RuntimeEnvironment.application; + when(mBackend.hasSentValidMsg(anyString(), anyInt())).thenReturn(true); + mAppRow = new NotificationBackend.AppRow(); + mAppRow.pkg = "pkg"; + mAppRow.uid = 0; mController = spy(new BubbleSummaryPreferenceController(mContext, mBackend)); } @@ -85,20 +92,27 @@ public class BubbleSummaryPreferenceControllerTest { } @Test - public void isAvailable_nullChannelNOTIFICATION_BUBBLESisOn_shouldReturnTrue() { + public void isAvailable_NOTIFICATION_BUBBLESisOn_shouldReturnTrue() { Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - mController.onResume(appRow, null, null, null, null, null); + mController.onResume(mAppRow, null, null, null, null, null); assertTrue(mController.isAvailable()); } @Test - public void isAvailable_nullChannelNOTIFICATION_BUBBLESisOff_shouldReturnFalse() { + public void isAvailable_NOTIFICATION_BUBBLESisOn_neverSentMsg_shouldReturnFalse() { + Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); + mController.onResume(mAppRow, null, null, null, null, null); + when(mBackend.hasSentValidMsg(anyString(), anyInt())).thenReturn(false); + + assertFalse(mController.isAvailable()); + } + + @Test + public void isAvailable_NOTIFICATION_BUBBLESisOff_shouldReturnFalse() { Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - mController.onResume(appRow, null, null, null, null, null); + mController.onResume(mAppRow, null, null, null, null, null); assertFalse(mController.isAvailable()); } @@ -107,10 +121,9 @@ public class BubbleSummaryPreferenceControllerTest { public void isAvailable_nonNullChannelNOTIFICATION_BUBBLESisOff_shouldReturnFalse() { Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF); - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); - mController.onResume(appRow, channel, null, null, null, null); + mController.onResume(mAppRow, channel, null, null, null, null); assertFalse(mController.isAvailable()); } @@ -118,20 +131,18 @@ public class BubbleSummaryPreferenceControllerTest { @Test public void isAvailable_defaultChannelNOTIFICATION_BUBBLESisOn_shouldReturnTrue() { Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID); - mController.onResume(appRow, channel, null, null, null, null); + mController.onResume(mAppRow, channel, null, null, null, null); assertTrue(mController.isAvailable()); } @Test public void updateState_setsIntent() { - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.bubblePreference = BUBBLE_PREFERENCE_ALL; - mController.onResume(appRow, null, null, null, null, null); + mAppRow.bubblePreference = BUBBLE_PREFERENCE_ALL; + mController.onResume(mAppRow, null, null, null, null, null); Preference pref = new Preference(mContext); mController.updateState(pref);