Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert Add set default browser modal (Uplift to 1.20.x) #7825

Merged
merged 1 commit into from
Feb 4, 2021
Merged

Revert Add set default browser modal (Uplift to 1.20.x) #7825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions android/brave_java_resources.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,8 +673,6 @@ brave_java_resources = [
"java/res/drawable/ic_onboarding_graphic_tipping.xml",
"java/res/drawable/ic_phone.xml",
"java/res/drawable/ic_polygon_1.xml",
"java/res/drawable/ic_setbraveasdefault.xml",
"java/res/drawable/ic_setbraveasdefault_dark.xml",
"java/res/drawable/ic_shield_done_filled.xml",
"java/res/drawable/ic_shield_done_filled_20dp.xml",
"java/res/drawable/ic_sort.xml",
Expand Down Expand Up @@ -728,7 +726,6 @@ brave_java_resources = [
"java/res/layout/activity_ntp_widget_stack.xml",
"java/res/layout/activity_onboarding.xml",
"java/res/layout/activity_p3a_onboarding.xml",
"java/res/layout/activity_set_default_browser.xml",
"java/res/layout/binance_deposit_item.xml",
"java/res/layout/binance_deposit_layout.xml",
"java/res/layout/binance_spinner_dropdown_item.xml",
Expand Down
1 change: 0 additions & 1 deletion android/brave_java_sources.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/CrossPromotionalModalDialogFragment.java",
"../../brave/android/java/org/chromium/chrome/browser/InternetConnection.java",
"../../brave/android/java/org/chromium/chrome/browser/QRCodeShareDialogFragment.java",
"../../brave/android/java/org/chromium/chrome/browser/SetDefaultBrowserActivity.java",
"../../brave/android/java/org/chromium/chrome/browser/app/BraveActivity.java",
"../../brave/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java",
"../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java",
Expand Down
5 changes: 0 additions & 5 deletions android/java/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@
android:theme="@style/Theme.Chromium.Activity.Fullscreen"
android:screenOrientation="sensorPortrait"/>

<activity
android:name="org.chromium.chrome.browser.SetDefaultBrowserActivity"
android:theme="@style/Theme.Chromium.Activity.Fullscreen"
android:screenOrientation="sensorPortrait"/>

<activity
android:name="org.chromium.chrome.browser.ntp.widget.NTPWidgetStackActivity"
android:theme="@style/Theme.Chromium.Activity"
Expand Down
66 changes: 0 additions & 66 deletions android/java/org/chromium/chrome/browser/SetDefaultBrowserActivity.java
View file
Open in desktop

This file was deleted.

36 changes: 1 addition & 35 deletions android/java/org/chromium/chrome/browser/app/BraveActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.CrossPromotionalModalDialogFragment;
import org.chromium.chrome.browser.LaunchIntentDispatcher;
import org.chromium.chrome.browser.SetDefaultBrowserActivity;
import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
import org.chromium.chrome.browser.bookmarks.BookmarkModel;
import org.chromium.chrome.browser.brave_stats.BraveStatsUtil;
Expand Down Expand Up @@ -120,7 +119,6 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
public static final String OPEN_URL = "open_url";

private static final int DAYS_4 = 4;
private static final int DAYS_5 = 5;
private static final int DAYS_12 = 12;

/**
Expand Down Expand Up @@ -360,38 +358,6 @@ public void finishNativeInitialization() {
openRewardsPanel();
BraveRewardsHelper.setRewardsOnboardingModalShown(true);
}

if (SharedPreferencesManager.getInstance().readInt(BravePreferenceKeys.BRAVE_APP_OPEN_COUNT)
== 1) {
Calendar calender = Calendar.getInstance();
calender.setTime(new Date());
calender.add(Calendar.DATE, DAYS_5);
OnboardingPrefManager.getInstance().setNextSetDefaultBrowserModalDate(
calender.getTimeInMillis());
}
checkSetDefaultBrowserModal();
}

private void checkSetDefaultBrowserModal() {
boolean shouldShowDefaultBrowserModal =
(OnboardingPrefManager.getInstance().getNextSetDefaultBrowserModalDate() > 0
&& System.currentTimeMillis()
> OnboardingPrefManager.getInstance()
.getNextSetDefaultBrowserModalDate());
boolean shouldShowDefaultBrowserModalAfterP3A =
OnboardingPrefManager.getInstance().shouldShowDefaultBrowserModalAfterP3A();
if (!BraveSetDefaultBrowserNotificationService.isBraveSetAsDefaultBrowser(this)
&& (shouldShowDefaultBrowserModalAfterP3A || shouldShowDefaultBrowserModal)) {
Intent setDefaultBrowserIntent = new Intent(this, SetDefaultBrowserActivity.class);
setDefaultBrowserIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
startActivity(setDefaultBrowserIntent);
if (shouldShowDefaultBrowserModal) {
OnboardingPrefManager.getInstance().setNextSetDefaultBrowserModalDate(0);
}
if (shouldShowDefaultBrowserModalAfterP3A) {
OnboardingPrefManager.getInstance().setShowDefaultBrowserModalAfterP3A(false);
}
}
}

private void checkForYandexSE() {
Expand Down Expand Up @@ -515,7 +481,7 @@ private boolean isNoRestoreState() {
return ContextUtils.getAppSharedPreferences().getBoolean(PREF_CLOSE_TABS_ON_EXIT, false);
}

public void handleBraveSetDefaultBrowserDialog() {
private void handleBraveSetDefaultBrowserDialog() {
/* (Albert Wang): Default app settings didn't get added until API 24
* https://developer.android.com/reference/android/provider/Settings#ACTION_MANAGE_DEFAULT_APPS_SETTINGS
*/
Expand Down
25 changes: 1 addition & 24 deletions android/java/org/chromium/chrome/browser/onboarding/OnboardingPrefManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,10 @@ public class OnboardingPrefManager {
private static final String PREF_ONBOARDING_V2 = "onboarding_v2";
private static final String PREF_NEXT_ONBOARDING_DATE = "next_onboarding_date";
private static final String PREF_NEXT_CROSS_PROMO_MODAL_DATE = "next_cross_promo_modal_date";
private static final String PREF_NEXT_SET_DEFAULT_BROWSER_MODAL_DATE =
"next_set_default_browser_modal_date";
private static final String PREF_ONBOARDING_FOR_SKIP = "onboarding_for_skip";
private static final String PREF_ONBOARDING_SKIP_COUNT = "onboarding_skip_count";
private static final String PREF_SEARCH_ENGINE_ONBOARDING = "search_engine_onboarding";
private static final String PREF_SHOW_DEFAULT_BROWSER_MODAL_AFTER_P3A =
"show_default_browser_modal_after_p3a";
private static final String PREF_SHIELDS_TOOLTIP = "shields_tooltip";
public static final String PREF_BRAVE_STATS = "brave_stats";
public static final String PREF_BRAVE_STATS_NOTIFICATION = "brave_stats_notification";
public static final String ONBOARDING_TYPE = "onboarding_type";
Expand Down Expand Up @@ -247,26 +244,6 @@ public void setNextCrossPromoModalDate(long nextDate) {
sharedPreferencesEditor.apply();
}

public long getNextSetDefaultBrowserModalDate() {
return mSharedPreferences.getLong(PREF_NEXT_SET_DEFAULT_BROWSER_MODAL_DATE, 0);
}

public void setNextSetDefaultBrowserModalDate(long nextDate) {
SharedPreferences.Editor sharedPreferencesEditor = mSharedPreferences.edit();
sharedPreferencesEditor.putLong(PREF_NEXT_SET_DEFAULT_BROWSER_MODAL_DATE, nextDate);
sharedPreferencesEditor.apply();
}

public boolean shouldShowDefaultBrowserModalAfterP3A() {
return mSharedPreferences.getBoolean(PREF_SHOW_DEFAULT_BROWSER_MODAL_AFTER_P3A, false);
}

public void setShowDefaultBrowserModalAfterP3A(boolean shouldShow) {
SharedPreferences.Editor sharedPreferencesEditor = mSharedPreferences.edit();
sharedPreferencesEditor.putBoolean(PREF_SHOW_DEFAULT_BROWSER_MODAL_AFTER_P3A, shouldShow);
sharedPreferencesEditor.apply();
};

public void setCrossPromoModalShown(boolean isShown) {
SharedPreferences.Editor sharedPreferencesEditor = mSharedPreferences.edit();
sharedPreferencesEditor.putBoolean(PREF_CROSS_PROMO_MODAL, isShown);
Expand Down
3 changes: 1 addition & 2 deletions android/java/org/chromium/chrome/browser/onboarding/P3aOnboardingActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public class P3aOnboardingActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_p3a_onboarding);
OnboardingPrefManager.getInstance().setP3aOnboardingShown(true);

boolean isFirstInstall = PackageUtils.isFirstInstall(this);

Expand Down Expand Up @@ -71,8 +72,6 @@ public void onClick(View view) {
&& BraveActivity.getBraveActivity() != null) {
BraveActivity.getBraveActivity().showOnboardingV2(false);
}
OnboardingPrefManager.getInstance().setP3aOnboardingShown(true);
OnboardingPrefManager.getInstance().setShowDefaultBrowserModalAfterP3A(true);
finish();
}
});
Expand Down
Loading