Merge branches 'dev/ooni-run-v2' and 'master' of github.com:ooni/prob…

…e-android into dev/ooni-run-v2
ooni · Jul 12, 2024 · d7c9ab5 · d7c9ab5
2 parents cc375d9 + 4729cfa
commit d7c9ab5
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 516 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -219,11 +219,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:foregroundServiceType="dataSync"

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/MainActivity.java
@@ -2,19 +2,25 @@
 
 import static org.openobservatory.ooniprobe.common.worker.UpdateDescriptorsWorkerKt.PROGRESS;
 
-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 android.view.View;
 
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.work.Constraints;
 import androidx.work.ExistingPeriodicWorkPolicy;
@@ -30,6 +36,8 @@
 import org.openobservatory.ooniprobe.R;
 import org.openobservatory.ooniprobe.common.AppUpdatesViewModel;
 import org.openobservatory.ooniprobe.activity.reviewdescriptorupdates.ReviewDescriptorUpdatesActivity;
+import org.openobservatory.ooniprobe.common.Application;
+import org.openobservatory.ooniprobe.common.NotificationUtility;
 import org.openobservatory.ooniprobe.common.PreferenceManager;
 import org.openobservatory.ooniprobe.common.TestDescriptorManager;
 import org.openobservatory.ooniprobe.common.ThirdPartyServices;
@@ -73,6 +81,8 @@ public class MainActivity extends ReviewUpdatesAbstractActivity implements Confi
     @Inject
     AppUpdatesViewModel updatesViewModel;
 
+    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);
@@ -134,9 +144,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);
             scheduleWorkers();
@@ -152,6 +167,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             }
         }
         onNewIntent(getIntent());
+        requestNotificationPermission();
     }
 
     private void scheduleWorkers() {
@@ -209,6 +225,43 @@ public void fetchManualUpdate() {
                 .observe(this, this::onManualUpdatesFetchComplete);
     }
 
+    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);
+            }
+        }
+    }
 
     /**
      * Listens to updates from the {@link ManualUpdateDescriptorsWorker}.
@@ -307,6 +360,17 @@ protected void onNewIntent(Intent intent) {
     @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) {

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/PromptActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/PromptActivity.java
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/RunningActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/RunningActivity.java
@@ -72,11 +72,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))