From e6f53f470df53a481b6189438d4ac38cf24e3463 Mon Sep 17 00:00:00 2001 From: Android Dialer Date: Mon, 21 May 2018 13:16:45 -0700 Subject: Adds alternative spam words for non-english speaking countries. This CL adds alternative spam words and code for using these words in an experiment. Test: Tap, Unit tests where alterntive experiment is provided and not provided. PiperOrigin-RevId: 197444892 Change-Id: Iff042966f1728ac571699085f07d1325e756dd36 --- .../spam/SpamAlternativeExperimentUtil.java | 52 +++++++++++++ .../incallui/spam/SpamCallListListener.java | 24 ++++-- .../incallui/spam/SpamNotificationActivity.java | 17 +++- .../android/incallui/spam/res/values/strings.xml | 91 ++++++++++++++++++++++ 4 files changed, 175 insertions(+), 9 deletions(-) create mode 100644 java/com/android/incallui/spam/SpamAlternativeExperimentUtil.java diff --git a/java/com/android/incallui/spam/SpamAlternativeExperimentUtil.java b/java/com/android/incallui/spam/SpamAlternativeExperimentUtil.java new file mode 100644 index 000000000..52eadcff3 --- /dev/null +++ b/java/com/android/incallui/spam/SpamAlternativeExperimentUtil.java @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.incallui.spam; + +import android.content.Context; +import com.android.dialer.common.LogUtil; +import com.android.dialer.configprovider.ConfigProviderBindings; + +/** Returns resource id based on experiment number. */ +public final class SpamAlternativeExperimentUtil { + + /** + * Returns the resource id using a resource name for an experiment where we want to use + * alternative words for the keyword spam. + */ + public static int getResourceIdByName(String resourceName, Context context) { + long experiment = + ConfigProviderBindings.get(context).getLong("experiment_for_alternative_spam_word", 230150); + LogUtil.i( + "SpamAlternativeExperimentUtil.getResourceIdByName", "using experiment %d", experiment); + String modifiedResourceName = resourceName; + if (experiment != 230150) { + modifiedResourceName = resourceName + "_" + experiment; + } + int resourceId = + context + .getResources() + .getIdentifier(modifiedResourceName, "string", context.getPackageName()); + if (resourceId == 0) { + LogUtil.i( + "SpamAlternativeExperimentUtil.getResourceIdByName", + "not found experiment %d", + experiment); + return context.getResources().getIdentifier(resourceName, "string", context.getPackageName()); + } + return resourceId; + } +} diff --git a/java/com/android/incallui/spam/SpamCallListListener.java b/java/com/android/incallui/spam/SpamCallListListener.java index 350dd60fc..d03055568 100644 --- a/java/com/android/incallui/spam/SpamCallListListener.java +++ b/java/com/android/incallui/spam/SpamCallListListener.java @@ -277,11 +277,15 @@ public class SpamCallListListener implements CallList.Listener { Notification.Builder notificationBuilder = createAfterCallNotificationBuilder(call) .setContentText( - context.getString(R.string.spam_notification_non_spam_call_collapsed_text)) + context.getString( + SpamAlternativeExperimentUtil.getResourceIdByName( + "spam_notification_non_spam_call_collapsed_text", context))) .setStyle( new Notification.BigTextStyle() .bigText( - context.getString(R.string.spam_notification_non_spam_call_expanded_text))) + context.getString( + SpamAlternativeExperimentUtil.getResourceIdByName( + "spam_notification_non_spam_call_expanded_text", context)))) // Add contact .addAction( new Notification.Action.Builder( @@ -392,12 +396,17 @@ public class SpamCallListListener implements CallList.Listener { Notification.Builder notificationBuilder = createAfterCallNotificationBuilder(call) .setLargeIcon(Icon.createWithResource(context, R.drawable.spam_notification_icon)) - .setContentText(context.getString(R.string.spam_notification_spam_call_collapsed_text)) + .setContentText( + context.getString( + SpamAlternativeExperimentUtil.getResourceIdByName( + "spam_notification_spam_call_collapsed_text", context))) // Not spam .addAction( new Notification.Action.Builder( R.drawable.quantum_ic_close_vd_theme_24, - context.getString(R.string.spam_notification_was_not_spam_action_text), + context.getString( + SpamAlternativeExperimentUtil.getResourceIdByName( + "spam_notification_was_not_spam_action_text", context)), createNotSpamPendingIntent(call)) .build()) // Block/report spam @@ -408,11 +417,16 @@ public class SpamCallListListener implements CallList.Listener { createBlockReportSpamPendingIntent(call)) .build()) .setContentTitle( - context.getString(R.string.spam_notification_title, getDisplayNumber(call))); + context.getString( + SpamAlternativeExperimentUtil.getResourceIdByName( + "spam_notification_title", context), + getDisplayNumber(call))); DialerNotificationManager.notify( context, getNotificationTagForCall(call), NOTIFICATION_ID, notificationBuilder.build()); } + + /** * Creates a pending intent for block/report spam action. If enabled, this intent is forwarded to * the {@link SpamNotificationActivity}, otherwise to the {@link SpamNotificationService}. diff --git a/java/com/android/incallui/spam/SpamNotificationActivity.java b/java/com/android/incallui/spam/SpamNotificationActivity.java index 37755fc53..4c0c67c92 100644 --- a/java/com/android/incallui/spam/SpamNotificationActivity.java +++ b/java/com/android/incallui/spam/SpamNotificationActivity.java @@ -406,7 +406,9 @@ public class SpamNotificationActivity extends FragmentActivity { .setCancelable(false) .setTitle( getString( - R.string.spam_notification_title, getFormattedNumber(number, applicationContext))) + SpamAlternativeExperimentUtil.getResourceIdByName( + "spam_notification_title", applicationContext), + getFormattedNumber(number, applicationContext))) .setNeutralButton( getString(R.string.spam_notification_action_dismiss), new DialogInterface.OnClickListener() { @@ -428,7 +430,9 @@ public class SpamNotificationActivity extends FragmentActivity { } }) .setNegativeButton( - getString(R.string.spam_notification_was_not_spam_action_text), + getString( + SpamAlternativeExperimentUtil.getResourceIdByName( + "spam_notification_was_not_spam_action_text", applicationContext)), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -494,7 +498,10 @@ public class SpamNotificationActivity extends FragmentActivity { .setTitle( getString(R.string.non_spam_notification_title, getFormattedNumber(number, context))) .setCancelable(false) - .setMessage(getString(R.string.spam_notification_non_spam_call_expanded_text)) + .setMessage( + getString( + SpamAlternativeExperimentUtil.getResourceIdByName( + "spam_notification_non_spam_call_expanded_text", context))) .setNeutralButton( getString(R.string.spam_notification_action_dismiss), new DialogInterface.OnClickListener() { @@ -514,7 +521,9 @@ public class SpamNotificationActivity extends FragmentActivity { } }) .setNegativeButton( - getString(R.string.spam_notification_dialog_block_report_spam_action_text), + getString( + SpamAlternativeExperimentUtil.getResourceIdByName( + "spam_notification_dialog_block_report_spam_action_text", context)), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/java/com/android/incallui/spam/res/values/strings.xml b/java/com/android/incallui/spam/res/values/strings.xml index e893f2afc..7626754e3 100644 --- a/java/com/android/incallui/spam/res/values/strings.xml +++ b/java/com/android/incallui/spam/res/values/strings.xml @@ -44,6 +44,97 @@ Yes, block number + + + Was %1$s a junk caller? + + %1$s blocked and call was reported as junk. + + Call from %1$s reported as not junk. + + Tap to add to contacts or block junk number. + + This is the first time this number called you. If this call was junk, you can block this number and report it. + + Tap to report as not junk or block it + + Block & report junk + + No, not junk + + + + Was %1$s a junk/spam caller? + + %1$s blocked and call was reported as junk/spam. + + Call from %1$s reported as not junk/spam. + + Tap to add to contacts or block junk/spam number. + + This is the first time this number called you. If this call was junk/spam, you can block this number and report it. + + Tap to report as not junk/spam or block it + + Block & report junk/spam + + No, not junk/spam + + + + Was %1$s an unwanted caller? + + %1$s blocked and call was reported as unwanted. + + Call from %1$s reported as useful. + + Tap to add to contacts or block unwanted number. + + This is the first time this number called you. If this call was unwanted, you can block this number and report it. + + Tap to report as useful or block it + + Block & report unwanted + + No, not unwanted + + + + Was %1$s a spam/unwanted caller? + + %1$s blocked and call was reported as spam/unwanted. + + Call from %1$s reported as not spam/unwanted. + + Tap to add to contacts or block spam/unwanted number. + + This is the first time this number called you. If this call was spam/unwanted, you can block this number and report it. + + Tap to report as not spam/unwanted or block it + + Block & report spam/unwanted + + No, not spam/unwanted + + + + Was %1$s a junk/unwanted caller? + + %1$s blocked and call was reported as junk/unwanted. + + Call from %1$s reported as not junk/unwanted. + + Tap to add to contacts or block junk/unwanted number. + + This is the first time this number called you. If this call was junk/unwanted, you can block this number and report it. + + Tap to report as not junk/unwanted or block it + + Block & report junk/unwanted + + No, not junk/unwanted + + Dismiss -- cgit v1.2.3 From 00d7edeabd1100fa0a9ce6090df0402e771a735f Mon Sep 17 00:00:00 2001 From: Android Dialer Date: Mon, 21 May 2018 14:16:34 -0700 Subject: Bump version codes and name to v22 Test: n/a PiperOrigin-RevId: 197456564 Change-Id: I1f8348fbeba098d3c6522a9ba0d8e083beb60dbe --- AndroidManifest.xml | 4 ++-- java/com/android/dialer/binary/google/AndroidManifest.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b16689520..52c2ee221 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,8 +16,8 @@ + android:versionCode="2800000" + android:versionName="22.0"> + android:versionCode="2800000" + android:versionName="22.0"> Date: Mon, 21 May 2018 14:44:52 -0700 Subject: Ignore dialer OMTP VVM error if VVM is disabled The status will be stale. TEST=TAP Bug: 78831353 Test: TAP PiperOrigin-RevId: 197462056 Change-Id: Iaeeae9007f6b5ad8319889a860fdcce782be8a0d --- .../app/calllog/VisualVoicemailCallLogFragment.java | 4 ++-- .../dialer/app/voicemail/VoicemailErrorManager.java | 4 +++- .../dialer/voicemail/listui/NewVoicemailFragment.java | 4 +++- .../voicemail/listui/error/VoicemailStatus.java | 19 ++++++++++++++++++- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java index dba43a2f7..5b6eb0387 100644 --- a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java +++ b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java @@ -182,10 +182,10 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment { } @VisibleForTesting - static boolean shouldAutoSync( + boolean shouldAutoSync( VoicemailErrorMessageCreator errorMessageCreator, List statuses) { for (VoicemailStatus status : statuses) { - if (!status.isActive()) { + if (!status.isActive(getContext())) { continue; } if (errorMessageCreator.isSyncBlockingError(status)) { diff --git a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java index ffaf16d18..a441e7986 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java +++ b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java @@ -86,9 +86,11 @@ public class VoicemailErrorManager implements CallLogQueryHandler.Listener, Voic List statuses = new ArrayList<>(); while (statusCursor.moveToNext()) { VoicemailStatus status = new VoicemailStatus(context, statusCursor); - if (status.isActive()) { + if (status.isActive(context)) { statuses.add(status); addServiceStateListener(status); + } else { + LogUtil.i("VisualVoicemailCallLogFragment.shouldAutoSync", "inactive source ignored"); } } alertItem.updateStatus(statuses, this); diff --git a/java/com/android/dialer/voicemail/listui/NewVoicemailFragment.java b/java/com/android/dialer/voicemail/listui/NewVoicemailFragment.java index b2052c61e..243dc6a86 100644 --- a/java/com/android/dialer/voicemail/listui/NewVoicemailFragment.java +++ b/java/com/android/dialer/voicemail/listui/NewVoicemailFragment.java @@ -280,7 +280,9 @@ public final class NewVoicemailFragment extends Fragment implements LoaderCallba while (cursor.moveToNext()) { VoicemailStatus status = new VoicemailStatus(context, cursor); - if (status.isActive()) { + if (status.isActive(context)) { + LogUtil.i( + "NewVoicemailFragment.queryVoicemailStatus", "inactive source ignored"); statuses.add(status); // TODO(a bug): Handle Service State Listeners } diff --git a/java/com/android/dialer/voicemail/listui/error/VoicemailStatus.java b/java/com/android/dialer/voicemail/listui/error/VoicemailStatus.java index 4f4dbbbe8..ebda0e658 100644 --- a/java/com/android/dialer/voicemail/listui/error/VoicemailStatus.java +++ b/java/com/android/dialer/voicemail/listui/error/VoicemailStatus.java @@ -34,6 +34,8 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import com.android.dialer.common.LogUtil; import com.android.dialer.voicemailstatus.VoicemailStatusQuery; +import com.android.voicemail.VoicemailClient; +import com.android.voicemail.VoicemailComponent; /** Structured data from {@link android.provider.VoicemailContract.Status} */ public class VoicemailStatus { @@ -232,7 +234,22 @@ public class VoicemailStatus { } } - public boolean isActive() { + public boolean isActive(Context context) { + VoicemailClient voicemailClient = VoicemailComponent.get(context).getVoicemailClient(); + if (context.getPackageName().equals(sourcePackage)) { + if (!voicemailClient.isVoicemailModuleEnabled()) { + LogUtil.i("VoicemailStatus.isActive", "module disabled"); + return false; + } + if (!voicemailClient.hasCarrierSupport(context, getPhoneAccountHandle())) { + LogUtil.i("VoicemailStatus.isActive", "carrier not supported"); + return false; + } + if (!voicemailClient.isVoicemailEnabled(context, getPhoneAccountHandle())) { + LogUtil.i("VoicemailStatus.isActive", "VVM disabled"); + return false; + } + } switch (configurationState) { case Status.CONFIGURATION_STATE_NOT_CONFIGURED: case Status.CONFIGURATION_STATE_DISABLED: -- cgit v1.2.3 From 0a41f3c3f1cefcd71cbdd79299fba3482e23a5e2 Mon Sep 17 00:00:00 2001 From: zachh Date: Mon, 21 May 2018 15:18:41 -0700 Subject: Check for WRITE_CALL_LOG permission in CallLogNotificationsQueryHelper. TEST=unit Bug: 79667976,79925108 Test: unit PiperOrigin-RevId: 197468611 Change-Id: Ifedddd2bccd76b1fc2c9d3ea4e9854bfe6a218e5 --- .../dialer/app/calllog/CallLogNotificationsQueryHelper.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java index ce6e5baf4..d13702931 100644 --- a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java +++ b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java @@ -111,7 +111,14 @@ public class CallLogNotificationsQueryHelper { return; } if (!PermissionsUtil.hasPhonePermissions(context)) { - LogUtil.e("CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead", "no permission"); + LogUtil.e( + "CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead", "no phone permission"); + return; + } + if (!PermissionsUtil.hasCallLogWritePermissions(context)) { + LogUtil.e( + "CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead", + "no call log write permission"); return; } -- cgit v1.2.3