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.

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

[Android] Fixed feedback url in settings #7052

Merged
merged 1 commit into from
Nov 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions android/brave_java_sources.gni
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/custom_layout/VerticalViewPager.java",
"../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java",
"../../brave/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java",
"../../brave/android/java/org/chromium/chrome/browser/feedback/BraveHelpAndFeedbackLauncherImpl.java",
"../../brave/android/java/org/chromium/chrome/browser/help/BraveHelpAndFeedback.java",
"../../brave/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java",
"../../brave/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java",
Expand Down
7 changes: 7 additions & 0 deletions android/java/org/chromium/chrome/browser/BraveAppHooks.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

package org.chromium.chrome.browser;

import org.chromium.chrome.browser.feedback.BraveHelpAndFeedbackLauncherImpl;
import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher;
import org.chromium.chrome.browser.help.BraveHelpAndFeedback;
import org.chromium.chrome.browser.help.HelpAndFeedback;
import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmark;
Expand All @@ -17,6 +19,11 @@ public HelpAndFeedback createHelpAndFeedback() {
return new BraveHelpAndFeedback();
}

@Override
public HelpAndFeedbackLauncher createHelpAndFeedbackLauncher() {
return new BraveHelpAndFeedbackLauncherImpl();
}

@Override
public PartnerBookmark.BookmarkIterator getPartnerBookmarkIterator() {
return null;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/* Copyright (c) 2020 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

package org.chromium.chrome.browser.feedback;

import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.provider.Browser;

import javax.annotation.Nonnull;

public class BraveHelpAndFeedbackLauncherImpl extends HelpAndFeedbackLauncherImpl {
protected static final String FALLBACK_SUPPORT_URL = "https://community.brave.com/";

@Override
protected void show(
Activity activity, String helpContext, @Nonnull FeedbackCollector collector) {
launchFallbackSupportUri(activity);
}

@Override
protected void showFeedback(Activity activity, @Nonnull FeedbackCollector collector) {
launchFallbackSupportUri(activity);
}

protected static void launchFallbackSupportUri(Context context) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(FALLBACK_SUPPORT_URL));
// Let Chrome know that this intent is from Chrome, so that it does not close the app when
// the user presses 'back' button.
intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName());
intent.putExtra(Browser.EXTRA_CREATE_NEW_TAB, true);
intent.setPackage(context.getPackageName());
context.startActivity(intent);
}
}