brave · gdregalo · Mar 24, 2020
diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
@@ -17,13 +17,18 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/BraveIntentHandler.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveLaunchIntentDispatcher.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRelaunchUtils.java",
+  "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsBalance.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveSyncWorker.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java",
+  "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsExternalWallet.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java",
+  "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsPublisher.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java",
+  "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsUserWalletActivity.java",
+  "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsVerifyWalletActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuAdapter.java",
   "../../brave/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuHandler.java",
   "../../brave/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuObserver.java",
@@ -32,13 +37,15 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkWorker.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/flags/BraveFeatureUtilities.java",
   "../../brave/android/java/org/chromium/chrome/browser/help/BraveHelpAndFeedback.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationManagerProxyImpl.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java",
+  "../../brave/android/java/org/chromium/chrome/browser/BraveUphold.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/channels/BraveChannelDefinitions.java",
   "../../brave/android/java/org/chromium/chrome/browser/ntp/BraveDuckDuckGoOfferView.java",
   "../../brave/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java",

diff --git a/android/java/AndroidManifest.xml b/android/java/AndroidManifest.xml
@@ -12,6 +12,14 @@
 <activity android:name="org.chromium.chrome.browser.BraveRewardsSiteBannerActivity"
     android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
+<activity
+    android:name="org.chromium.chrome.browser.BraveRewardsVerifyWalletActivity"
+    android:theme="@style/Theme.Chromium.Activity.Fullscreen"/>
+
+<activity
+    android:name="org.chromium.chrome.browser.BraveRewardsUserWalletActivity"
+    android:theme="@style/BraveTranslucent"/>
+
 <!-- Onboarding notification -->
 <receiver android:name="org.chromium.chrome.browser.notifications.BraveOnboardingNotification"
     android:exported="false">

diff --git a/android/java/org/chromium/chrome/browser/BraveActivity.java b/android/java/org/chromium/chrome/browser/BraveActivity.java
@@ -17,6 +17,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -59,11 +60,14 @@
 @JNINamespace("chrome::android")
 public abstract class BraveActivity extends ChromeActivity {
     public static final int SITE_BANNER_REQUEST_CODE = 33;
+    public static final int VERIFY_WALLET_ACTIVITY_REQUEST_CODE = 34;
+    public static final int USER_WALLET_ACTIVITY_REQUEST_CODE = 35;
     public static final String ADD_FUNDS_URL = "chrome://rewards/#add-funds";
     public static final String REWARDS_SETTINGS_URL = "chrome://rewards/";
     public static final String REWARDS_AC_SETTINGS_URL = "chrome://rewards/contribute";
     public static final String REWARDS_LEARN_MORE_URL = "https://brave.com/faq-rewards/#unclaimed-funds";
     private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
+    public static final String OPEN_URL = "open_url";
 
     /**
      * Settings for sending local notification reminders.
@@ -317,6 +321,22 @@ public void OnRewardsPanelDismiss() {
         }
     }
 
+    public void dismissRewardsPanel() {
+        BraveToolbarLayout layout = (BraveToolbarLayout)findViewById(R.id.toolbar);
+        assert layout != null;
+        if (layout != null) {
+            layout.dismissRewardsPanel();
+        }
+    }
+
+    public void openRewardsPanel() {
+        BraveToolbarLayout layout = (BraveToolbarLayout)findViewById(R.id.toolbar);
+        assert layout != null;
+        if (layout != null) {
+            layout.openRewardsPanel();
+        }
+    }
+
     public Tab selectExistingTab(String url) {
         Tab tab = getActivityTab();
         if (tab != null && tab.getUrl().equals(url)) {
@@ -373,4 +393,20 @@ static public BraveActivity getBraveActivity() {
 
         return null;
     }
+
+    @Override
+    public void onActivityResult (int requestCode, int resultCode,
+            Intent data) {
+        if (resultCode == RESULT_OK &&
+                (requestCode == VERIFY_WALLET_ACTIVITY_REQUEST_CODE ||
+                requestCode == USER_WALLET_ACTIVITY_REQUEST_CODE ||
+                requestCode == SITE_BANNER_REQUEST_CODE) ) {
+            dismissRewardsPanel();
+            String open_url = data.getStringExtra(BraveActivity.OPEN_URL);
+            if (! TextUtils.isEmpty(open_url)) {
+                openNewOrSelectExistingTab(open_url);
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
 }
diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsBalance.java b/android/java/org/chromium/chrome/browser/BraveRewardsBalance.java
@@ -0,0 +1,68 @@
+/** 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;
+
+import androidx.annotation.VisibleForTesting;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.HashMap;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+class BraveRewardsBalance {
+    public static final String WALLET_ANONYMOUS = "anonymous";
+    public static final String WALLET_UPHOLD = "uphold";
+    public static final String WALLET_BLINDED = "blinded";
+
+    /**
+     * matching consts in
+     * src/brave/components/brave_rewards/browser/balance.h
+     */
+    public static final String JSON_TOTAL = "total";
+    public static final String JSON_RATES = "rates";
+    public static final String JSON_WALLETS = "wallets";
+
+    double mTotal;
+    Map <String, Double> mRates;
+    Map <String, Double> mWallets;
+
+    BraveRewardsBalance (String json_balance) throws JSONException {
+        fromJson (json_balance);
+    }
+
+    private void fromJson(String json_balance) throws JSONException {
+        JSONObject jsonroot = new JSONObject(json_balance);
+        mTotal = jsonroot.getDouble(JSON_TOTAL);
+
+        mRates = new HashMap <>();
+        JSONObject json_rates = jsonroot.getJSONObject(JSON_RATES);
+        Iterator<String> keys = json_rates.keys();
+        while(keys.hasNext()) {
+            String key = keys.next();
+            Double val = json_rates.getDouble(key);
+            mRates.put (key, val);
+        }
+
+        mWallets = new HashMap <>();
+        JSONObject json_wallets = jsonroot.getJSONObject(JSON_WALLETS);
+        keys = json_wallets.keys();
+        while(keys.hasNext()) {
+            String key = keys.next();
+            Double val = json_wallets.getDouble(key);
+            mWallets.put (key, val);
+        }
+    }
+
+    @VisibleForTesting
+    @Override
+    public String toString() {
+        return "BraveRewardsBalance{" +
+                "mTotal=" + mTotal +
+                ", mRates=" + mRates +
+                ", mWallets=" + mWallets +'}';
+    }
+}
diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsExternalWallet.java b/android/java/org/chromium/chrome/browser/BraveRewardsExternalWallet.java
@@ -0,0 +1,122 @@
+/** 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;
+
+import android.content.Context;
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import org.chromium.base.ContextUtils;
+import org.chromium.chrome.R;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+class BraveRewardsExternalWallet {
+    //fields
+    public static final String ACCOUNT_URL = "account_url";
+    public static final String ADD_URL = "add_url";
+    public static final String ADDRESS = "address";
+    public static final String STATUS = "status";
+    public static final String TOKEN = "token";
+    public static final String TYPE = "type";
+    public static final String USER_NAME = "user_name";
+    public static final String VERIFY_URL = "verify_url";
+    public static final String WITHDRAW_URL = "withdraw_url";
+
+    //WalletStatus @
+    //vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({NOT_CONNECTED, CONNECTED, VERIFIED, DISCONNECTED_NOT_VERIFIED,
+            DISCONNECTED_VERIFIED, PENDING})
+    public @interface WalletStatus {}
+    public static final int NOT_CONNECTED = 0;
+    public static final int CONNECTED = 1;
+    public static final int VERIFIED = 2;
+    public static final int DISCONNECTED_NOT_VERIFIED = 3;
+    public static final int DISCONNECTED_VERIFIED = 4;
+    public static final int PENDING = 5;
+
+    public String mAccount_url;
+    public String mAdd_url;
+    public String mAddress;
+    @WalletStatus public int mStatus;
+    public String mToken;
+    public String mType;
+    public String mUser_name;
+    public String mVerify_url;
+    public String mWithdraw_url;
+
+
+    BraveRewardsExternalWallet (String json_external_wallet) throws JSONException {
+        fromJson (json_external_wallet);
+    }
+
+    private void fromJson(String json_external_wallet) throws JSONException {
+        JSONObject jsonObj = new JSONObject(json_external_wallet);
+        mAccount_url = jsonObj.getString(ACCOUNT_URL);
+        mAdd_url = jsonObj.getString(ADD_URL);
+        mAddress = jsonObj.getString(ADDRESS);
+        mStatus = jsonObj.getInt(STATUS);
+        mToken = jsonObj.getString(TOKEN);
+        mType = jsonObj.getString(TYPE);
+        mUser_name = jsonObj.getString(USER_NAME);
+        mVerify_url = jsonObj.getString(VERIFY_URL);
+        mWithdraw_url = jsonObj.getString(WITHDRAW_URL);
+    }
+
+    @VisibleForTesting
+    @Override
+    public String toString() {
+        return "BraveRewardsExternalWallet{" +
+                "mAccount_url='" + mAccount_url + '\'' +
+                ", mAdd_url='" + mAdd_url + '\'' +
+                ", mAddress='" + mAddress + '\'' +
+                ", mStatus=" + mStatus +
+                ", mToken='" + mToken + '\'' +
+                ", mType='" + mType + '\'' +
+                ", mUser_name='" + mUser_name + '\'' +
+                ", mVerify_url='" + mVerify_url + '\'' +
+                ", mWithdraw_url='" + mWithdraw_url + '\'' +
+                '}';
+    }
+
+    public static String WalletStatusToString (@WalletStatus int status){
+        String value = "";
+        Context context = ContextUtils.getApplicationContext();
+        switch (status){
+            case NOT_CONNECTED:
+                value = context.getResources().getString(
+                    R.string.user_wallet_status_not_connected);
+                break;
+            case CONNECTED:
+                value = context.getResources().getString(
+                    R.string.user_wallet_status_connected);
+                break;
+            case VERIFIED:
+                value = context.getResources().getString(
+                    R.string.user_wallet_status_verified);
+                break;
+            case DISCONNECTED_NOT_VERIFIED:
+                value = context.getResources().getString(
+                    R.string.user_wallet_status_disconnected_not_verified);
+                break;
+            case DISCONNECTED_VERIFIED:
+                value = context.getResources().getString(
+                    R.string.user_wallet_status_disconnected_verified);
+                break;
+            case PENDING:
+                value = context.getResources().getString(
+                    R.string.user_wallet_status_pending);
+                break;
+            default:
+                break;
+        }
+        return value;
+    }
+}