Merge pull request #6403 from brave/over-promotions

Over promotions
brave · Aug 13, 2020 · ed12438 · ed12438
2 parents 2afafa5 + eb3a5ba
commit ed12438
Show file tree

Hide file tree

Showing 29 changed files with 90 additions and 429 deletions.
diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java
@@ -240,7 +240,4 @@ public void OnResetTheWholeState(boolean success) {}
 
     @Override
     public void OnRewardsMainEnabled(boolean enabled) {}
-
-    @Override
-    public void OnFetchPromotions() {}
 }
diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java
@@ -309,12 +309,6 @@ public void GetGrant(String promotionId) {
         }
     }
 
-    public int GetCurrentGrantsCount() {
-        synchronized(lock) {
-            return nativeGetCurrentGrantsCount(mNativeBraveRewardsNativeWorker);
-        }
-    }
-
     public String[] GetCurrentGrant(int position) {
         synchronized(lock) {
             return nativeGetCurrentGrant(mNativeBraveRewardsNativeWorker, position);
@@ -601,13 +595,6 @@ public void OnRewardsMainEnabled(boolean enabled) {
         }
     }
 
-    @CalledByNative
-    public void OnFetchPromotions() {
-        for (BraveRewardsObserver observer : mObservers) {
-            observer.OnFetchPromotions();
-        }
-    }
-
     @CalledByNative
     public void OnGetExternalWallet(int error_code, String external_wallet) {
         for (BraveRewardsObserver observer : mObservers) {
@@ -663,7 +650,6 @@ private native void nativeDonate(long nativeBraveRewardsNativeWorker, String pub
     private native void nativeDeleteNotification(
             long nativeBraveRewardsNativeWorker, String notification_id);
     private native void nativeGetGrant(long nativeBraveRewardsNativeWorker, String promotionId);
-    private native int nativeGetCurrentGrantsCount(long nativeBraveRewardsNativeWorker);
     private native String[] nativeGetCurrentGrant(long nativeBraveRewardsNativeWorker, int position);
     private native void nativeGetPendingContributionsTotal(long nativeBraveRewardsNativeWorker);
     private native void nativeGetRecurringDonations(long nativeBraveRewardsNativeWorker);

diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsObserver.java b/android/java/org/chromium/chrome/browser/BraveRewardsObserver.java
@@ -23,7 +23,6 @@ default public void OnGetLatestNotification(String id, int type, long timestamp,
   default public void OnRecurringDonationUpdated() {};
   default public void OnResetTheWholeState(boolean success) {};
   default public void OnRewardsMainEnabled(boolean enabled) {};
-  default public void OnFetchPromotions() {};
   default public void OnGrantFinish(int result) {};
   default public void OnGetExternalWallet(int error_code,
           String external_wallet) {};

diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java
@@ -397,28 +397,6 @@ public void onClick(View v) {
             }));
         }
 
-        Button btGrants = (Button)this.root.findViewById(R.id.grants_dropdown);
-        if (btGrants != null) {
-            btGrants.setText(isAnonWallet ? context.getResources().getString(R.string.brave_ui_details) : context.getResources().getString(R.string.brave_ui_grants));
-            btGrants.setOnClickListener((new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    ListView listView = (ListView)thisObject.root.findViewById(R.id.grants_listview);
-                    Button btGrants = (Button)thisObject.root.findViewById(R.id.grants_dropdown);
-                    if (listView == null || btGrants == null) {
-                        return;
-                    }
-                    if (listView.getVisibility() == View.VISIBLE) {
-                        btGrants.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.down_icon, 0);
-                        listView.setVisibility(View.GONE);
-                    } else {
-                        btGrants.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.up_icon, 0);
-                        listView.setVisibility(View.VISIBLE);
-                    }
-                }
-            }));
-        }
-
         SetRewardsSummaryMonthYear();
         // Starts Send a tip Activity
         Button btSendATip = (Button)root.findViewById(R.id.send_a_tip);
@@ -1107,45 +1085,6 @@ public void OnWalletInitialized(int error_code) {
         mWalletCreateInProcess = false;
     }
 
-    @Override
-    public void OnFetchPromotions() {
-        int currentGrantsCount = mBraveRewardsNativeWorker.GetCurrentGrantsCount();
-        Button btGrants = (Button)this.root.findViewById(R.id.grants_dropdown);
-        if (currentGrantsCount != 0) {
-            btGrants.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.down_icon, 0);
-            btGrants.setVisibility(View.VISIBLE);
-
-            ListView listView = (ListView)this.root.findViewById(R.id.grants_listview);
-
-            ArrayAdapter<Spanned> adapter = new ArrayAdapter<Spanned>(
-                ContextUtils.getApplicationContext(), R.layout.brave_rewards_grants_list_item);
-            for (int i = 0; i < currentGrantsCount; i++) {
-                String[] grant = mBraveRewardsNativeWorker.GetCurrentGrant(i);
-                if (grant.length < 3) {
-                    continue;
-                }
-                String toInsert = "<b><font color=#ffffff>" + String.format(Locale.getDefault(), "%.3f", Double.parseDouble(grant[0])) + " " + batPointsText + "</font></b> ";
-
-                if (grant[2].equals(BraveRewardsPanelPopup.ADS_GRANT_TYPE) == false) {
-                    Calendar calTime = Calendar.getInstance();
-                    calTime.setTimeInMillis(Long.parseLong(grant[1]) * 1000);
-                    String date = Integer.toString(calTime.get(Calendar.MONTH) + 1) + "/" +
-                                  Integer.toString(calTime.get(Calendar.DAY_OF_MONTH)) + "/" +
-                                  Integer.toString(calTime.get(Calendar.YEAR));
-                    toInsert += String.format(this.root.getResources().getString(R.string.brave_ui_expires_on),
-                                              date);
-                } else {
-                    toInsert += this.root.getResources().getString(R.string.brave_ui_ads_earnings);
-                }
-
-                adapter.add(BraveRewardsHelper.spannedFromHtmlString(toInsert));
-            }
-            listView.setAdapter(adapter);
-        } else {
-            btGrants.setVisibility(View.GONE);
-        }
-    }
-
     /**
      *The 'progress_wallet_update' substitutes 'br_bat_wallet' when not initialized
      *The 'br_usd_wallet' is invisible when not initialized

diff --git a/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsService.java b/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsService.java
@@ -116,7 +116,4 @@ public void OnWalletInitialized(int error_code) {
 
     @Override
     public void OnRewardsMainEnabled(boolean enabled){};
-
-    @Override
-    public void OnFetchPromotions() {}
 }
diff --git a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java
@@ -173,9 +173,6 @@ public void OnRecurringDonationUpdated() {}
     @Override
     public void OnResetTheWholeState(boolean success) {}
 
-    @Override
-    public void OnFetchPromotions() {}
-
     @Override
     public void OnRewardsMainEnabled(boolean enabled) {}
 }
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java
@@ -153,9 +153,6 @@ public void OnGetReconcileStamp(long timestamp) {}
     @Override
     public void OnRecurringDonationUpdated() {}
 
-    @Override
-    public void OnFetchPromotions() {}
-
     @Override
     public void OnResetTheWholeState(boolean success) {
         if (success) {

diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
@@ -786,9 +786,6 @@ public void OnRecurringDonationUpdated() {}
   @Override
   public void OnResetTheWholeState(boolean success) {}
 
-  @Override
-  public void OnFetchPromotions() {}
-
   @Override
   public void OnRewardsMainEnabled(boolean enabled) {
 

diff --git a/android/java/res/layout/brave_rewards_panel_header.xml b/android/java/res/layout/brave_rewards_panel_header.xml
@@ -158,30 +158,6 @@
                 android:layout_row="3"
                 android:layout_columnSpan="2">
 
-                <Button
-                    android:id="@+id/grants_dropdown"
-                    android:layout_height="25dp"
-                    android:layout_width="wrap_content"
-                    android:background="@drawable/rewards_button"
-                    android:text="@string/brave_ui_grants"
-                    android:fontFamily="sans-serif"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp"
-                    android:textSize="8sp"
-                    android:textColor="#FFFFFF"
-                    android:visibility="gone"
-                    android:alpha=".5"
-                    tools:ignore="SmallSp"/>
-
-                <ListView
-                        android:id="@+id/grants_listview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="fill_parent"
-                        android:layout_marginBottom="-15dp"
-                        android:divider="@null"
-                        android:dividerHeight="0dp"
-                        android:visibility="gone"
-                        tools:ignore="NestedScrolling" />
                 <LinearLayout
                     android:layout_height="wrap_content"
                     android:layout_width="fill_parent"

diff --git a/browser/brave_rewards/android/brave_rewards_native_worker.cc b/browser/brave_rewards/android/brave_rewards_native_worker.cc
@@ -386,11 +386,6 @@ void BraveRewardsNativeWorker::OnClaimPromotion(const int32_t result,
       weak_java_brave_rewards_native_worker_.get(env), result);
 }
 
-int BraveRewardsNativeWorker::GetCurrentGrantsCount(JNIEnv* env,
-        const base::android::JavaParamRef<jobject>& obj) {
-  return promotions_.size();
-}
-
 base::android::ScopedJavaLocalRef<jobjectArray>
     BraveRewardsNativeWorker::GetCurrentGrant(JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
@@ -640,27 +635,6 @@ void BraveRewardsNativeWorker::OnGetRewardsMainEnabled(
     weak_java_brave_rewards_native_worker_.get(env), enabled);
 }
 
-void BraveRewardsNativeWorker::OnFetchPromotions(
-    brave_rewards::RewardsService* rewards_service,
-    const uint32_t result,
-    const std::vector<brave_rewards::Promotion>& list) {
-  // All unclaimed promotions come via notifications,
-  // we filter claimed here to show in a panel
-
-  promotions_.clear();
-  for (auto& promotion : list) {
-    if ((ledger::PromotionStatus)promotion.status !=
-        ledger::PromotionStatus::FINISHED) {
-      continue;
-    }
-    promotions_.push_back(promotion);
-  }
-
-  JNIEnv* env = base::android::AttachCurrentThread();
-  Java_BraveRewardsNativeWorker_OnFetchPromotions(env,
-    weak_java_brave_rewards_native_worker_.get(env));
-}
-
 int BraveRewardsNativeWorker::GetAdsPerHour(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj) {

diff --git a/browser/brave_rewards/android/brave_rewards_native_worker.h b/browser/brave_rewards/android/brave_rewards_native_worker.h
@@ -113,9 +113,6 @@ class BraveRewardsNativeWorker : public brave_rewards::RewardsServiceObserver,
     void GetGrant(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj,
         const base::android::JavaParamRef<jstring>& promotionId);
 
-    int GetCurrentGrantsCount(JNIEnv* env,
-        const base::android::JavaParamRef<jobject>& obj);
-
     base::android::ScopedJavaLocalRef<jobjectArray> GetCurrentGrant(
         JNIEnv* env, const base::android::JavaParamRef<jobject>& obj,
         int position);
@@ -240,10 +237,6 @@ class BraveRewardsNativeWorker : public brave_rewards::RewardsServiceObserver,
     bool IsAnonWallet(JNIEnv* env,
         const base::android::JavaParamRef<jobject>& jcaller);
 
-    void OnFetchPromotions(brave_rewards::RewardsService* rewards_service,
-        const uint32_t result,
-        const std::vector<brave_rewards::Promotion>& list) override;
-
     void OnClaimPromotion(const int32_t result,
         std::unique_ptr<brave_rewards::Promotion> promotion);
 

diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.cc b/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.cc
@@ -200,4 +200,10 @@ void LoadURL(Browser* browser, GURL url) {
   WaitForLoadStop(contents);
 }
 
+void ReloadCurrentSite(Browser* browser) {
+  auto* contents = browser->tab_strip_model()->GetActiveWebContents();
+  contents->GetController().Reload(content::ReloadType::NORMAL, true);
+  EXPECT_TRUE(WaitForLoadStop(contents));
+}
+
 }  // namespace rewards_browsertest_helper
diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.h b/components/brave_rewards/browser/test/common/rewards_browsertest_context_helper.h
@@ -35,6 +35,8 @@ void VisitPublisher(
 
 void LoadURL(Browser* browser, GURL url);
 
+void ReloadCurrentSite(Browser* browser);
+
 }  // namespace rewards_browsertest_helper
 
 #endif  // BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_TEST_COMMON_REWARDS_BROWSERTEST_CONTEXT_HELPER_H_
diff --git a/components/brave_rewards/browser/test/rewards_browsertest.cc b/components/brave_rewards/browser/test/rewards_browsertest.cc
@@ -158,8 +158,7 @@ IN_PROC_BROWSER_TEST_F(RewardsBrowserTest, ToggleAutoContribute) {
   rewards_browsertest_helper::EnableRewards(browser());
 
   // once rewards has loaded, reload page to activate auto-contribute
-  contents()->GetController().Reload(content::ReloadType::NORMAL, true);
-  EXPECT_TRUE(WaitForLoadStop(contents()));
+  rewards_browsertest_helper::ReloadCurrentSite(browser());
 
   // toggle auto contribute off
   rewards_browsertest_util::WaitForElementThenClick(

diff --git a/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc b/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc
@@ -357,8 +357,7 @@ IN_PROC_BROWSER_TEST_F(
 
   rewards_browsertest_helper::EnableRewards(browser());
 
-  contents()->GetController().Reload(content::ReloadType::NORMAL, true);
-  EXPECT_TRUE(WaitForLoadStop(contents()));
+  rewards_browsertest_helper::ReloadCurrentSite(browser());
 
   // Tip unverified publisher
   contribution_->TipViaCode(
@@ -539,8 +538,7 @@ IN_PROC_BROWSER_TEST_F(
   contribution_->SetUpUpholdWallet(50.0, ledger::WalletStatus::CONNECTED);
 
   rewards_browsertest_helper::EnableRewards(browser());
-  contents()->GetController().Reload(content::ReloadType::NORMAL, true);
-  EXPECT_TRUE(WaitForLoadStop(contents()));
+  rewards_browsertest_helper::ReloadCurrentSite(browser());
 
   const double amount = 5.0;
   contribution_->TipViaCode(
@@ -565,8 +563,7 @@ IN_PROC_BROWSER_TEST_F(
   contribution_->SetUpUpholdWallet(50.0);
 
   rewards_browsertest_helper::EnableRewards(browser());
-  contents()->GetController().Reload(content::ReloadType::NORMAL, true);
-  EXPECT_TRUE(WaitForLoadStop(contents()));
+  rewards_browsertest_helper::ReloadCurrentSite(browser());
 
   const double amount = 5.0;
   contribution_->TipViaCode(