Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7932 from brave/fix_play_console_bugs_1.20_android

Browse Source 
Fix play console bugs
This commit is contained in:
Deep Pandya
2021-02-22 09:28:40 -05:00
committed by GitHub
parent 5b3c1dd753 1915ae793f
commit ec6286960e
6 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java
+12 -16
View File
@@ -7,8 +7,6 @@
package org.chromium.chrome.browser.notifications;
import android.app.Activity;
import androidx.appcompat.app.AppCompatActivity;
import android.app.Notification;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
@@ -16,14 +14,15 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import org.chromium.base.ContextUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.app.BraveActivity;
import org.chromium.chrome.browser.dialogs.BraveAdsNotificationDialog;
import org.chromium.chrome.browser.notifications.BraveAdsNotificationBuilder;
import org.chromium.chrome.browser.notifications.NotificationBuilderBase;
import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
import org.chromium.chrome.browser.notifications.retention.RetentionNotificationUtil;
import org.chromium.chrome.browser.notifications.retention.RetentionNotificationPublisher;
import org.chromium.chrome.browser.notifications.retention.RetentionNotificationUtil;
import org.chromium.components.browser_ui.notifications.NotificationManagerProxyImpl;
import org.chromium.components.browser_ui.notifications.NotificationMetadata;
import org.chromium.components.browser_ui.notifications.NotificationWrapper;
@@ -46,19 +45,16 @@ public class BraveOnboardingNotification extends BroadcastReceiver {
private static final String COUNTRY_CODE_DE = "de_DE";
private static final String COUNTRY_CODE_FR = "fr_FR";
public static void showOnboardingDialog(Activity activity) {
Context context = activity.getApplicationContext();
BraveAdsNotificationDialog.displayAdsNotification(
activity,
BRAVE_ONBOARDING_NOTIFICATION_TAG,
getNotificationUrl(),
context.getString(R.string.brave_ui_brave_rewards),
context.getString(R.string.this_is_your_first_ad)
);
public static void showOnboardingDialog() {
Context context = ContextUtils.getApplicationContext();
BraveAdsNotificationDialog.displayAdsNotification(context,
BRAVE_ONBOARDING_NOTIFICATION_TAG, getNotificationUrl(),
context.getString(R.string.brave_ui_brave_rewards),
context.getString(R.string.this_is_your_first_ad));
}
public static void showOnboardingNotification(Activity activity) {
Context context = activity.getApplicationContext();
public static void showOnboardingNotification() {
Context context = ContextUtils.getApplicationContext();
if (context == null) return;
NotificationManagerProxyImpl notificationManager =
new NotificationManagerProxyImpl(context);
@@ -107,9 +103,9 @@ public class BraveOnboardingNotification extends BroadcastReceiver {
}
} else {
if (intent.getBooleanExtra(USE_CUSTOM_NOTIFICATION, false)) {
showOnboardingDialog(braveActivity);
showOnboardingDialog();
} else {
showOnboardingNotification(braveActivity);
showOnboardingNotification();
}
if (braveActivity != null) {
braveActivity.hideRewardsOnboardingIcon();
android/java/org/chromium/chrome/browser/onboarding/OnboardingPrefManager.java
+2 -2
View File
@@ -230,9 +230,9 @@ public class OnboardingPrefManager {
context.startActivity(intent);
}
public void onboardingNotification(Context context) {
public void onboardingNotification() {
if (!isOnboardingNotificationShown()) {
BraveOnboardingNotification.showOnboardingNotification((Activity) context);
BraveOnboardingNotification.showOnboardingNotification();
setOnboardingNotificationShown(true);
}
}
android/java/org/chromium/chrome/browser/onboarding/P3aOnboardingActivity.java
+14 -3
View File
@@ -24,6 +24,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import org.chromium.base.Log;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.BraveRewardsHelper;
import org.chromium.chrome.browser.app.BraveActivity;
@@ -46,13 +47,23 @@ public class P3aOnboardingActivity extends AppCompatActivity {
? getResources().getString(R.string.p3a_onboarding_title_text_1)
: getResources().getString(R.string.p3a_onboarding_title_text_2));
CheckBox p3aOnboardingCheckbox = findViewById(R.id.p3a_onboarding_checkbox);
p3aOnboardingCheckbox.setChecked(BravePrefServiceBridge.getInstance().getP3AEnabled());
boolean isP3aEnabled = true;
try {
isP3aEnabled = BravePrefServiceBridge.getInstance().getP3AEnabled();
} catch (Exception e) {
Log.e("P3aOnboarding", e.getMessage());
}
p3aOnboardingCheckbox.setChecked(isP3aEnabled);
p3aOnboardingCheckbox.setOnCheckedChangeListener(
new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
BravePrefServiceBridge.getInstance().setP3AEnabled(isChecked);
BravePrefServiceBridge.getInstance().setP3ANoticeAcknowledged(true);
try {
BravePrefServiceBridge.getInstance().setP3AEnabled(isChecked);
BravePrefServiceBridge.getInstance().setP3ANoticeAcknowledged(true);
} catch (Exception e) {
Log.e("P3aOnboarding", e.getMessage());
}
}
});
ImageView p3aOnboardingImg = findViewById(R.id.p3a_onboarding_img);
android/java/org/chromium/chrome/browser/onboarding/v2/HighlightView.java
+5
View File
@@ -63,6 +63,11 @@ public class HighlightView extends FrameLayout {
Bitmap.Config.ARGB_8888);
Canvas overlayCanvas = new Canvas(overlay);
overlayCanvas.drawColor(0xcc1E2029);
if (item == null) {
return;
}
int width = item.getScreenRight() - item.getScreenLeft();
int height = item.getScreenBottom() - item.getScreenTop();
float radius = width > height ? ((float) width / 2) : ((float) height / 2);
browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsNotificationDialog.java
+3 -4
View File
@@ -33,7 +33,7 @@ public class BraveAdsNotificationDialog {
static AlertDialog mAdsDialog;
static String mNotificationId;
public static void displayAdsNotification(Activity activity, final String notificationId,
public static void displayAdsNotification(Context context, final String notificationId,
final String origin, final String title, final String body) {
try {
if (mAdsDialog != null) {
@@ -42,9 +42,9 @@ public class BraveAdsNotificationDialog {
} catch (IllegalArgumentException e) {
mAdsDialog = null;
}
AlertDialog.Builder b = new AlertDialog.Builder(activity);
AlertDialog.Builder b = new AlertDialog.Builder(context);
LayoutInflater inflater = (LayoutInflater) activity.getLayoutInflater();
LayoutInflater inflater = LayoutInflater.from(context);
b.setView(inflater.inflate(R.layout.brave_ads_custom_notification, null));
mAdsDialog = b.create();
@@ -102,7 +102,6 @@ public class BraveAdsNotificationDialog {
});
}
@CalledByNative
public static void displayAdsNotification(final String notificationId,
final String origin, final String title, final String body) {
browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java
+1 -1
View File
@@ -137,7 +137,7 @@ public class BraveAdsOnboardingFragment extends Fragment {
setProgress(progress, endTime);
tvTimer.setText("0");
OnboardingPrefManager.getInstance().onboardingNotification(getActivity());
OnboardingPrefManager.getInstance().onboardingNotification();
new Handler().postDelayed(new Runnable() {
@Override
public void run() {