Merge pull request #7225 from brave/fix_release_version_issues_android

Fix release version issues android
brave · Nov 21, 2020 · d5badd2 · d5badd2
2 parents 1b0a406 + ec30a92
commit d5badd2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
@@ -327,7 +327,9 @@ private void checkForNotificationData() {
             case RetentionNotificationUtil.BRAVE_STATS_ADS_TRACKERS:
             case RetentionNotificationUtil.BRAVE_STATS_DATA:
             case RetentionNotificationUtil.BRAVE_STATS_TIME:
-                if (!NewTabPage.isNTPUrl(getActivityTab().getUrlString())) {
+                if (getActivityTab() != null
+                    && getActivityTab().getUrlString() != null
+                    && !NewTabPage.isNTPUrl(getActivityTab().getUrlString())) {
                     getTabCreator(false).launchUrl(UrlConstants.NTP_URL, TabLaunchType.FROM_CHROME_UI);
                 }
                 break;

diff --git a/...oid/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java b/...oid/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java
@@ -226,7 +226,7 @@ protected void onPostExecute(Void result) {
                 Pair<String, String> adsTrackersPair =
                     BraveStatsUtil.getBraveStatsStringFormNumberPair(adsTrackersCount, false);
                 adsTrackersCountText.setText(
-                    String.format(getResources().getString(R.string.ntp_stat_text),
+                    String.format(mContext.getResources().getString(R.string.ntp_stat_text),
                                   adsTrackersPair.first, adsTrackersPair.second));
 
                 Pair<String, String> dataSavedPair =
@@ -253,7 +253,7 @@ protected void onPostExecute(Void result) {
                 Pair<String, String> timeSavedPair =
                         BraveStatsUtil.getBraveStatsStringFromTime(timeSavedCount / 1000);
                 timeSavedCountText.setText(
-                        String.format(getResources().getString(R.string.ntp_stat_text),
+                        String.format(mContext.getResources().getString(R.string.ntp_stat_text),
                                 timeSavedPair.first, timeSavedPair.second));
                 timeSavedText.setText(mContext.getResources().getString(R.string.time_saved_text));
 
@@ -331,10 +331,10 @@ protected void onPostExecute(Void result) {
 
                         mTrackerCountText.setText(String.valueOf(statPair.second));
                         mTrackerCountText.setTextColor(
-                            getResources().getColor(R.color.brave_stats_text_color));
+                            mContext.getResources().getColor(R.color.brave_stats_text_color));
                         mSiteText.setText(statPair.first);
                         mSiteText.setTextColor(
-                            getResources().getColor(R.color.brave_stats_text_color));
+                            mContext.getResources().getColor(R.color.brave_stats_text_color));
 
                         rootView.addView(layout);
                     }

diff --git a/android/java/org/chromium/chrome/browser/local_database/DatabaseHelper.java b/android/java/org/chromium/chrome/browser/local_database/DatabaseHelper.java
@@ -297,7 +297,7 @@ public long insertSavedBandwidth(SavedBandwidthTable savedBandwidthTable) {
     }
 
     public long getTotalSavedBandwidthWithDate(String thresholdTime, String currentTime) {
-        int sum = 0;
+        long sum = 0;
         String selectQuery = "SELECT  SUM(" + SavedBandwidthTable.COLUMN_SAVED_BANDWIDTH + ") as total FROM "
                              + SavedBandwidthTable.TABLE_NAME
                              + " WHERE " + BraveStatsTable.COLUMN_TIMESTAMP
@@ -307,22 +307,22 @@ public long getTotalSavedBandwidthWithDate(String thresholdTime, String currentT
         Cursor cursor = db.rawQuery(selectQuery, null);
 
         if (cursor.moveToFirst())
-            sum = cursor.getInt(cursor.getColumnIndex("total"));
+            sum = cursor.getLong(cursor.getColumnIndex("total"));
 
         cursor.close();
         return sum;
     }
 
     public long getTotalSavedBandwidth() {
-        int sum = 0;
+        long sum = 0;
         String selectQuery = "SELECT  SUM(" + SavedBandwidthTable.COLUMN_SAVED_BANDWIDTH + ") as total FROM "
                              + SavedBandwidthTable.TABLE_NAME;
 
         SQLiteDatabase db = this.getReadableDatabase();
         Cursor cursor = db.rawQuery(selectQuery, null);
 
         if (cursor.moveToFirst())
-            sum = cursor.getInt(cursor.getColumnIndex("total"));
+            sum = cursor.getLong(cursor.getColumnIndex("total"));
 
         cursor.close();
         return sum;

diff --git a/...a/org/chromium/chrome/browser/notifications/retention/RetentionNotificationPublisher.java b/...a/org/chromium/chrome/browser/notifications/retention/RetentionNotificationPublisher.java
@@ -56,7 +56,9 @@ public void onReceive(Context context, Intent intent) {
                 case RetentionNotificationUtil.BRAVE_STATS_ADS_TRACKERS:
                 case RetentionNotificationUtil.BRAVE_STATS_DATA:
                 case RetentionNotificationUtil.BRAVE_STATS_TIME:
-                    if (!NewTabPage.isNTPUrl(braveActivity.getActivityTab().getUrlString())) {
+                    if (braveActivity.getActivityTab() != null 
+                        && braveActivity.getActivityTab().getUrlString() != null
+                        && !NewTabPage.isNTPUrl(braveActivity.getActivityTab().getUrlString())) {
                         braveActivity.getTabCreator(false).launchUrl(UrlConstants.NTP_URL, TabLaunchType.FROM_CHROME_UI);
                     }
                     break;

diff --git a/android/java/org/chromium/chrome/browser/ntp/widget/NTPWidgetStackActivity.java b/android/java/org/chromium/chrome/browser/ntp/widget/NTPWidgetStackActivity.java
@@ -159,7 +159,9 @@ private void returnResult() {
             }
         }
         if (isFromSettings) {
-            BraveActivity.getBraveActivity().getActivityTab().reloadIgnoringCache();
+            if (BraveActivity.getBraveActivity() != null && BraveActivity.getBraveActivity().getActivityTab() != null) {
+                BraveActivity.getBraveActivity().getActivityTab().reloadIgnoringCache();
+            }
         } else {
             Intent intent = new Intent();
             setResult(BraveNewTabPageLayout.NTP_WIDGET_STACK_CODE, intent);