Revert "Fix: No prompt to enable notifications" (#777)

Reverts #603

app/src/main/AndroidManifest.xml

@@ -172,11 +172,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".activity.PromptActivity"
-            android:theme="@style/Theme.MaterialComponents.NoActionBar.Onboarding"
-            android:exported="false" />
-
 		<service
 			android:name=".common.service.RunTestService"
 			android:icon="@drawable/notification_icon"

app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java

@@ -1,14 +1,19 @@
 package org.openobservatory.ooniprobe.activity;
 
-import android.app.Activity;
+import static org.openobservatory.ooniprobe.common.service.RunTestService.CHANNEL_ID;
+
+import android.Manifest;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.provider.Settings;
 
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatDelegate;
@@ -17,6 +22,8 @@
 import com.google.android.material.snackbar.Snackbar;
 
 import org.openobservatory.ooniprobe.R;
+import org.openobservatory.ooniprobe.common.Application;
+import org.openobservatory.ooniprobe.common.NotificationUtility;
 import org.openobservatory.ooniprobe.common.PreferenceManager;
 import org.openobservatory.ooniprobe.common.ThirdPartyServices;
 import org.openobservatory.ooniprobe.common.service.ServiceUtil;
@@ -46,6 +53,8 @@ public class MainActivity extends AbstractActivity implements ConfirmDialogFragm
     @Inject
     PreferenceManager preferenceManager;
 
+    private ActivityResultLauncher<String> requestPermissionLauncher;
+
     public static Intent newIntent(Context context, int resItem) {
         return new Intent(context, MainActivity.class).putExtra(RES_ITEM, resItem).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
     }
@@ -88,9 +97,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                         .withExtra(AUTOTEST_DIALOG)
                         .build().show(getSupportFragmentManager(), null);
             } else if (notificationManager.shouldShow()) {
-                    registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-                        if (result.getResultCode() == Activity.RESULT_OK) {}
-                    }).launch(PromptActivity.newIntent(this, PromptActivity.Prompt.CENSORSHIP_CONSENT));
+                new ConfirmDialogFragment.Builder()
+                        .withTitle(getString(R.string.Modal_EnableNotifications_Title))
+                        .withMessage(getString(R.string.Modal_EnableNotifications_Paragraph))
+                        .withPositiveButton(getString(R.string.Modal_SoundsGreat))
+                        .withNegativeButton(getString(R.string.Modal_NotNow))
+                        .withNeutralButton(getString(R.string.Modal_DontAskAgain))
+                        .withExtra(NOTIFICATION_DIALOG)
+                        .build().show(getSupportFragmentManager(), null);
             }
             ThirdPartyServices.checkUpdates(this);
         }
@@ -104,8 +118,46 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
             }
         }
+        requestNotificationPermission();
     }
 
+    private void requestNotificationPermission() {
+
+        requestPermissionLauncher = registerForActivityResult(
+                new ActivityResultContracts.RequestPermission(),
+                (result) -> {
+                    if (!result) {
+                        Snackbar.make(
+                                binding.getRoot(),
+                                "Please grant Notification permission from App Settings",
+                                Snackbar.LENGTH_LONG
+                                ).setAction(R.string.Settings_Title, view -> {
+                                    Intent intent = new Intent();
+                                    intent.setAction("android.settings.APP_NOTIFICATION_SETTINGS");
+                                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+                                    //for Android 5-7
+                                    intent.putExtra("app_package", getPackageName());
+                                    intent.putExtra("app_uid", getApplicationInfo().uid);
+
+                                    // for Android 8 and above
+                                    intent.putExtra("android.provider.extra.APP_PACKAGE", getPackageName());
+
+                                    startActivity(intent);
+                                }).show();
+                    }
+                }
+        );
+        NotificationUtility.setChannel(getApplicationContext(), CHANNEL_ID, getString(R.string.Settings_AutomatedTesting_Label), false, false, false);
+        if (ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED
+        ) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS);
+            }
+        }
+    }
 
     @Override
     protected void onNewIntent(Intent intent) {
@@ -127,6 +179,17 @@ else if (intent.getExtras().containsKey(NOTIFICATION_DIALOG)){
     @Override
     public void onConfirmation(Serializable extra, int i) {
         if (extra == null) return;
+        if (extra.equals(NOTIFICATION_DIALOG)) {
+            notificationManager.getUpdates(i == DialogInterface.BUTTON_POSITIVE);
+
+            //If positive answer reload consents and init notification
+            if (i == DialogInterface.BUTTON_POSITIVE){
+                ThirdPartyServices.reloadConsents((Application) getApplication());
+            }
+            else if (i == DialogInterface.BUTTON_NEUTRAL){
+                notificationManager.disableAskNotificationDialog();
+            }
+        }
         if (extra.equals(AUTOTEST_DIALOG)) {
             preferenceManager.setNotificationsFromDialog(i == DialogInterface.BUTTON_POSITIVE);
             if (i == DialogInterface.BUTTON_POSITIVE){

app/src/main/java/org/openobservatory/ooniprobe/activity/RunningActivity.java

@@ -70,11 +70,6 @@ public static void runAsForegroundService(AbstractActivity context,
                                               ArrayList<AbstractSuite> testSuites,
                                               OnTestServiceStartedListener onTestServiceStartedListener,
                                               PreferenceManager iPreferenceManager) {
-
-        if (iPreferenceManager.shouldShowTestProgressConsent()){
-            context.startActivity(PromptActivity.newIntent(context, PromptActivity.Prompt.TEST_PROGRESS_CONSENT));
-        }
-
         if (ReachabilityManager.getNetworkType(context).equals(ReachabilityManager.NO_INTERNET)) {
             new MessageDialogFragment.Builder()
                     .withTitle(context.getString(R.string.Modal_Error))

app/src/main/java/org/openobservatory/ooniprobe/common/PreferenceManager.java

@@ -27,7 +27,6 @@ public class PreferenceManager {
 	public static final int NOTIFICATION_DIALOG_COUNT = 7;
 	public static final int AUTOTEST_DIALOG_COUNT = 5;
 	static final String NOTIFICATION_DIALOG_DISABLE = "isNotificationDialogDisabled";
-	static final String TEST_PROGRESS_NOTIFICATION_DISABLE = "isTestProgressNotificationDisabled";
 	private static final String AUTOTEST_DIALOG_DISABLE = "isAutomaticTestDialogDisabled";
 	private static final String TOKEN = "token";
 	static final String SHOW_ONBOARDING = "first_run";
@@ -116,31 +115,6 @@ public boolean isNotifications() {
 		return sp.getBoolean(r.getString(R.string.notifications_enabled), false);
 	}
 
-	public boolean isTestProgressNotifications() {
-		return sp.getBoolean(r.getString(R.string.test_progress_notifications_enabled), false);
-	}
-
-	public boolean isAskTestProgressNotificationConsent() {
-		return sp.getBoolean(TEST_PROGRESS_NOTIFICATION_DISABLE, false);
-	}
-
-	public void disableAskTestProgressNotificationConsent() {
-		sp.edit().putBoolean(TEST_PROGRESS_NOTIFICATION_DISABLE, true)
-				.apply();
-	}
-
-	public void setTestProgressNotificationConsent(boolean enabled) {
-		//set notification value and increment app open
-		sp.edit()
-				.putBoolean(r.getString(R.string.test_progress_notifications_enabled), enabled)
-				.apply();
-	}
-
-	public boolean shouldShowTestProgressConsent() {
-		return !isTestProgressNotifications()
-				&& !isAskTestProgressNotificationConsent();
-	}
-
 	public boolean isDarkTheme() {
 		return sp.getBoolean(r.getString(R.string.theme_enabled), false);
 	}