Merge branch 'master' into prod

Author: artemiv4nov

adguard_cb/build.gradle

@@ -18,8 +18,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         applicationId 'com.adguard.android.contentblocker'
-        versionCode 22000003
-        versionName '2.5.2'
+        versionCode 22000004
+        versionName '2.5.3'
         signingConfig signingConfigs.config
     }
 

adguard_cb/src/main/java/com/adguard/android/contentblocker/ui/MainActivity.java

@@ -200,6 +200,9 @@ private void showRateDialog(Intent intent) {
             return;
         }
 
+        // We show notification MAX_RATE_DIALOG_COUNT times or while user didn't push a notification
+        preferencesService.setAppRated(true);
+
         int filledCount = intent.getIntExtra(STARS_COUNT, 0);
         final View dialogLayout = LayoutInflater.from(this).inflate(R.layout.rate_dialog, null);
         final ViewGroup starsLayout = dialogLayout.findViewById(R.id.stars_layout);
@@ -222,7 +225,6 @@ private void showRateDialog(Intent intent) {
         View.OnClickListener buttonsListener = v -> {
             if (v.getId() == R.id.button_submit) {
                 // TODO collect feedback
-                preferencesService.setAppRated(true);
                 showFeedbackSubmitDialog();
             }
             preferencesService.increaseRateAppDialogCount();