Merge pull request #1353 from jbc25/oppia-1653-update-api-34

alexlittle · web-flow · commit 9d63866a852b · 2024-07-19T08:11:25.000+03:00
Oppia 1653 update api 34
diff --git a/app/src/androidTest/java/androidTestFiles/activities/DownloadActivityUITest.java b/app/src/androidTest/java/androidTestFiles/activities/DownloadActivityUITest.java
@@ -121,6 +121,7 @@ private CourseInstallViewAdapter getBaseCourse() {
 
     private void sendBroadcast(Context ctx, String action) {
         Intent intent = new Intent(CourseInstallerService.BROADCAST_ACTION);
+        intent.setPackage(ctx.getPackageName());
         intent.putExtra(CourseInstallerService.SERVICE_ACTION, action);
         intent.putExtra(CourseInstallerService.SERVICE_URL, "Mock URL");
         intent.putExtra(CourseInstallerService.SERVICE_MESSAGE, "1");
diff --git a/app/src/androidTest/java/androidTestFiles/activities/DownloadMediaActivityUITest.java b/app/src/androidTest/java/androidTestFiles/activities/DownloadMediaActivityUITest.java
@@ -45,6 +45,7 @@ public class DownloadMediaActivityUITest extends CourseMediaBaseTest {
 
     private void sendBroadcast(Context ctx, String action, String url) {
         Intent intent = new Intent(DownloadService.BROADCAST_ACTION);
+        intent.setPackage(ctx.getPackageName());
         intent.putExtra(DownloadService.SERVICE_ACTION, action);
         intent.putExtra(DownloadService.SERVICE_URL, url);
         intent.putExtra(DownloadService.SERVICE_MESSAGE, "1");
diff --git a/app/src/androidTest/java/androidTestFiles/features/BluetoothTransferTest.java b/app/src/androidTest/java/androidTestFiles/features/BluetoothTransferTest.java
@@ -36,6 +36,7 @@ public void setUp() throws Exception {
     private void sendBluetoothServiceBroadcast(String message, String errorMsg) {
 
         Intent broadcastIntent = new Intent(BluetoothTransferService.BROADCAST_ACTION);
+        broadcastIntent.setPackage(context.getPackageName());
         broadcastIntent.putExtra(BluetoothTransferService.SERVICE_MESSAGE, message);
         broadcastIntent.putExtra(BluetoothTransferService.SERVICE_ERROR, errorMsg);
         context.sendBroadcast(broadcastIntent);
diff --git a/app/src/androidTest/java/androidTestFiles/utils/parent/NotificationsUiTest.java b/app/src/androidTest/java/androidTestFiles/utils/parent/NotificationsUiTest.java
@@ -1,5 +1,6 @@
 package androidTestFiles.utils.parent;
 
+import android.content.Context;
 import android.content.Intent;
 
 import androidx.test.platform.app.InstrumentationRegistry;
@@ -13,6 +14,8 @@ public class NotificationsUiTest extends DaggerInjectMockUITest {
     @After
     public void tearDown() throws Exception {
         Intent closeIntent = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
-        InstrumentationRegistry.getInstrumentation().getTargetContext().sendBroadcast(closeIntent);
+        Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        closeIntent.setPackage(context.getPackageName());
+        context.sendBroadcast(closeIntent);
     }
 }
diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/AppActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/AppActivity.java
@@ -65,7 +65,6 @@
 import org.digitalcampus.oppia.model.Course;
 import org.digitalcampus.oppia.utils.TextUtilsJava;
 import org.digitalcampus.oppia.utils.UIUtils;
-import org.digitalcampus.oppia.utils.storage.Storage;
 import org.digitalcampus.oppia.utils.storage.StorageAccessStrategy;
 
 import java.util.concurrent.TimeUnit;
@@ -123,7 +122,7 @@ public void onStart(){
         intentFilter.addAction(Intent.ACTION_MEDIA_MOUNTED);
         intentFilter.addAction(Intent.ACTION_MEDIA_UNMOUNTED);
         intentFilter.addDataScheme("file");
-        registerReceiver(externalStorageReceiver, intentFilter);
+        ContextCompat.registerReceiver(this, externalStorageReceiver, intentFilter, ContextCompat.RECEIVER_NOT_EXPORTED);
 
         checkSdCardStatus();
     }
@@ -303,7 +302,7 @@ public void onResume() {
         gamificationReceiver.setGamificationEventListener(this);
         IntentFilter broadcastFilter = new IntentFilter(GamificationService.BROADCAST_ACTION);
         broadcastFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
-        registerReceiver(gamificationReceiver, broadcastFilter);
+        ContextCompat.registerReceiver(this, gamificationReceiver, broadcastFilter, ContextCompat.RECEIVER_NOT_EXPORTED);
 
         //We check if the user session time has expired to log him out
         if (BuildConfig.SESSION_EXPIRATION_ENABLED) {
diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/CourseActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/CourseActivity.java
@@ -32,6 +32,10 @@
 import android.view.WindowManager;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.fragment.app.Fragment;
+
 import com.google.android.material.tabs.TabLayout;
 
 import org.digitalcampus.mobile.learning.R;
@@ -59,10 +63,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.fragment.app.Fragment;
-
 public class CourseActivity extends AppActivity implements OnInitListener, TabLayout.OnTabSelectedListener {
 
     public static final String BASELINE_TAG = "BASELINE";
@@ -92,7 +92,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         binding = ActivityCourseBinding.inflate(LayoutInflater.from(this));
         setContentView(binding.getRoot());
-        
+
         ActionBar actionBar = getSupportActionBar();
 
         Bundle bundle = this.getIntent().getExtras();
@@ -114,28 +114,26 @@ public void onCreate(Bundle savedInstanceState) {
                 actionBar.setDisplayShowTitleEnabled(true);
             }
 
-            if (section.isProtectedByPassword() && !section.isUnlocked()){
+            if (section.isProtectedByPassword() && !section.isUnlocked()) {
                 topicLocked = true;
                 supportInvalidateOptionsMenu();
                 binding.unlockTopicForm.setVisibility(View.VISIBLE);
                 binding.submitPassword.setOnClickListener(view -> {
                     String password = binding.sectionPasswordField.getText().toString();
-                    if (section.checkPassword(password)){
+                    if (section.checkPassword(password)) {
                         DbHelper.getInstance(this).saveSectionUnlockedByUser(course, section, userID, password);
                         binding.unlockTopicForm.setVisibility(View.GONE);
                         topicLocked = false;
                         loadActivities();
                         supportInvalidateOptionsMenu();
-                    }
-                    else{
+                    } else {
                         binding.sectionPasswordError.setVisibility(View.VISIBLE);
                         SimpleAnimator.fade(binding.sectionPasswordError, SimpleAnimator.FADE_IN);
                         binding.sectionPasswordField.setText("");
                     }
 
                 });
-            }
-            else{
+            } else {
                 loadActivities();
             }
 
@@ -222,7 +220,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
         ttsMenuItem.setTitle(ttsRunning ? R.string.menu_stop_read_aloud : R.string.menu_read_aloud);
 
         // If there is only one language for this course, makes no sense to show the language menu
-        if (course.getLangs().size() <= 1){
+        if (course.getLangs().size() <= 1) {
             MenuItem langMenuItem = menu.findItem(R.id.menu_language);
             langMenuItem.setVisible(false);
             langMenuItem.setEnabled(false);
@@ -244,8 +242,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 return true;
 
             case R.id.menu_text_size:
-                UIUtils.showChangeTextSizeDialog(this,
-                        () -> sendBroadcast(new Intent(BaseWidget.ACTION_TEXT_SIZE_CHANGED)));
+                UIUtils.showChangeTextSizeDialog(this, () -> {
+                    Intent intent = new Intent(BaseWidget.ACTION_TEXT_SIZE_CHANGED);
+                    intent.setPackage(getPackageName());
+                    sendBroadcast(intent);
+                });
                 return true;
 
             case R.id.menu_help:
@@ -331,7 +332,7 @@ private void loadActivities() {
 
         for (int i = 0; i < activities.size(); i++) {
             Activity activity = determineActivityType(i, fragments);
-            if (activity != null){
+            if (activity != null) {
                 titles.add(activity.getTitle(currentLang));
             }
         }
@@ -344,7 +345,7 @@ private void loadActivities() {
         binding.tabsToolbar.addOnTabSelectedListener(this);
         apAdapter.updateTabViews(binding.tabsToolbar);
 
-        if (currentActivityNo >= fragments.size()){
+        if (currentActivityNo >= fragments.size()) {
             //Wrong activity number passed
             Toast.makeText(this, "Wrong activity parameter", Toast.LENGTH_SHORT).show();
             this.finish();
@@ -353,7 +354,7 @@ private void loadActivities() {
         binding.activityWidgetPager.setCurrentItem(currentActivityNo);
     }
 
-    private Activity determineActivityType(int i, List<Fragment> fragments){
+    private Activity determineActivityType(int i, List<Fragment> fragments) {
         Activity activity = activities.get(i);
         //Fragment creation
         if (activity.getActType().equalsIgnoreCase("page")) {
@@ -379,8 +380,7 @@ private Activity determineActivityType(int i, List<Fragment> fragments){
         } else if (activities.get(i).getActType().equalsIgnoreCase("url")) {
             UrlWidget f = UrlWidget.newInstance(activities.get(i), course, isBaseline);
             fragments.add(f);
-        }
-        else {
+        } else {
             return null;
         }
 
diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/DeviceListActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/DeviceListActivity.java
@@ -33,6 +33,7 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 
 import org.digitalcampus.mobile.learning.R;
 import org.digitalcampus.mobile.learning.databinding.ActivityDeviceListBinding;
@@ -119,11 +120,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // Register for broadcasts when a device is discovered
         IntentFilter filter = new IntentFilter(BluetoothDevice.ACTION_FOUND);
-        this.registerReceiver(mReceiver, filter);
+        ContextCompat.registerReceiver(this, mReceiver, filter, ContextCompat.RECEIVER_NOT_EXPORTED);
 
         // Register for broadcasts when discovery has finished
         filter = new IntentFilter(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
-        this.registerReceiver(mReceiver, filter);
+        ContextCompat.registerReceiver(this, mReceiver, filter, ContextCompat.RECEIVER_NOT_EXPORTED);
 
     }
 
@@ -147,7 +148,7 @@ protected void onResume() {
         receiver.setListener(this);
         IntentFilter broadcastFilter = new IntentFilter(BluetoothTransferService.BROADCAST_ACTION);
         broadcastFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
-        registerReceiver(receiver, broadcastFilter);
+        ContextCompat.registerReceiver(this, receiver, broadcastFilter, ContextCompat.RECEIVER_NOT_EXPORTED);
     }
 
     /**
diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/DownloadActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/DownloadActivity.java
@@ -28,6 +28,8 @@
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.core.content.ContextCompat;
+
 import org.digitalcampus.mobile.learning.R;
 import org.digitalcampus.mobile.learning.databinding.ActivityDownloadBinding;
 import org.digitalcampus.oppia.application.App;
@@ -256,7 +258,7 @@ public void onResume() {
         receiver.setCourseInstallerListener(this);
         IntentFilter broadcastFilter = new IntentFilter(CourseInstallerService.BROADCAST_ACTION);
         broadcastFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
-        registerReceiver(receiver, broadcastFilter);
+        ContextCompat.registerReceiver(this, receiver, broadcastFilter, ContextCompat.RECEIVER_NOT_EXPORTED);
 
         if (json == null) {
             // The JSON download task has not started or been completed yet
diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/DownloadMediaActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/DownloadMediaActivity.java
@@ -53,6 +53,7 @@
 import javax.inject.Inject;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 
 public class DownloadMediaActivity extends AppActivity implements DownloadMediaListener, ScanMediaListener {
 
@@ -244,7 +245,7 @@ public void onResume() {
         receiver.setMediaListener(this);
         IntentFilter broadcastFilter = new IntentFilter(DownloadService.BROADCAST_ACTION);
         broadcastFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
-        registerReceiver(receiver, broadcastFilter);
+        ContextCompat.registerReceiver(this, receiver, broadcastFilter, ContextCompat.RECEIVER_NOT_EXPORTED);
 
         invalidateOptionsMenu();
     }
diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/SyncActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/SyncActivity.java
@@ -44,6 +44,7 @@
 import java.util.List;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -184,7 +185,7 @@ public void onResume() {
         receiver.setListener(this);
         IntentFilter broadcastFilter = new IntentFilter(BluetoothTransferService.BROADCAST_ACTION);
         broadcastFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
-        registerReceiver(receiver, broadcastFilter);
+        ContextCompat.registerReceiver(this, receiver, broadcastFilter, ContextCompat.RECEIVER_NOT_EXPORTED);
 
         updateStatus(true);
 
diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/ViewDigestActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/ViewDigestActivity.java
@@ -8,6 +8,7 @@
 import android.view.View;
 
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 
 import org.digitalcampus.mobile.learning.R;
 import org.digitalcampus.mobile.learning.databinding.ActivityViewDigestBinding;
@@ -79,7 +80,7 @@ public void onResume() {
         receiver.setCourseInstallerListener(this);
         IntentFilter broadcastFilter = new IntentFilter(CourseInstallerService.BROADCAST_ACTION);
         broadcastFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
-        registerReceiver(receiver, broadcastFilter);
+        ContextCompat.registerReceiver(this, receiver, broadcastFilter, ContextCompat.RECEIVER_NOT_EXPORTED);
     }
 
     @Override
diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/CoursesListFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/CoursesListFragment.java
@@ -14,6 +14,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
@@ -150,10 +151,10 @@ public void onResume() {
         receiver.setCourseInstallerListener(this);
         IntentFilter broadcastFilter = new IntentFilter(CourseInstallerService.BROADCAST_ACTION);
         broadcastFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
-        getActivity().registerReceiver(receiver, broadcastFilter);
+        ContextCompat.registerReceiver(getActivity(), receiver, broadcastFilter, ContextCompat.RECEIVER_NOT_EXPORTED);
 
         IntentFilter coursesUpdatesBroadcastFilter = new IntentFilter(ACTION_COURSES_UPDATES);
-        getActivity().registerReceiver(coursesUpdatesReceiver, coursesUpdatesBroadcastFilter);
+        ContextCompat.registerReceiver(getActivity(), coursesUpdatesReceiver, coursesUpdatesBroadcastFilter, ContextCompat.RECEIVER_NOT_EXPORTED);
 
         if (adapterListCourses != null) {
             adapterListCourses.notifyDataSetChanged();
diff --git a/app/src/main/java/org/digitalcampus/oppia/gamification/GamificationService.java b/app/src/main/java/org/digitalcampus/oppia/gamification/GamificationService.java
@@ -238,6 +238,7 @@ private void broadcastEvent(GamificationEvent event, Activity act, Course c) {
         String message = gEngine.getEventMessage(event, c, act);
 
         Intent localIntent = new Intent(BROADCAST_ACTION);
+        localIntent.setPackage(getPackageName());
         localIntent.putExtra(SERVICE_MESSAGE, message);
         localIntent.putExtra(SERVICE_POINTS, event.getPoints());
 
diff --git a/app/src/main/java/org/digitalcampus/oppia/service/CoursesChecksWorkerManager.java b/app/src/main/java/org/digitalcampus/oppia/service/CoursesChecksWorkerManager.java
@@ -212,7 +212,8 @@ private void checkUpdatedOrDeletedCoursesAndNotify() {
 
         if (toUpdateCount > 0) {
             showToUpdateNotification(toUpdateCount);
-            context.sendBroadcast(new Intent(CoursesListFragment.ACTION_COURSES_UPDATES));
+            context.sendBroadcast(new Intent(CoursesListFragment.ACTION_COURSES_UPDATES)
+                    .setPackage(context.getPackageName()));
         }
 
 
diff --git a/app/src/main/java/org/digitalcampus/oppia/service/DownloadOppiaDataService.java b/app/src/main/java/org/digitalcampus/oppia/service/DownloadOppiaDataService.java
@@ -23,6 +23,8 @@
 import org.digitalcampus.oppia.utils.TextUtilsJava;
 
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
 import okhttp3.HttpUrl;
 
 import static android.content.Context.DOWNLOAD_SERVICE;
@@ -133,7 +135,8 @@ private void showDownloadSuccessDialog() {
     };
 
     public void onResume() {
-        context.registerReceiver(onDownloadComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+        IntentFilter filter = new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE);
+        ContextCompat.registerReceiver(context, onDownloadComplete, filter, ContextCompat.RECEIVER_NOT_EXPORTED);
     }
 
     public void onPause() {
diff --git a/app/src/main/java/org/digitalcampus/oppia/service/DownloadService.java b/app/src/main/java/org/digitalcampus/oppia/service/DownloadService.java
@@ -44,6 +44,8 @@
 import java.util.List;
 
 import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
+
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -99,7 +101,7 @@ public void onReceive(Context context, Intent intent) {
         //We register the alternative notifier for sending notifications when no other BroadcasReceiver is set
         IntentFilter broadcastFilter = new IntentFilter(DownloadService.BROADCAST_ACTION);
         broadcastFilter.setPriority(IntentFilter.SYSTEM_LOW_PRIORITY);
-        registerReceiver(alternativeNotifier, broadcastFilter);
+        ContextCompat.registerReceiver(this, alternativeNotifier, broadcastFilter, ContextCompat.RECEIVER_NOT_EXPORTED);
 
     }
 
diff --git a/app/src/main/java/org/digitalcampus/oppia/service/FileIntentService.java b/app/src/main/java/org/digitalcampus/oppia/service/FileIntentService.java
@@ -76,6 +76,7 @@ protected void logAndNotifyError(String fileUrl, Exception e){
     protected void sendBroadcast(String fileUrl, String result, String message){
 
         Intent localIntent = new Intent(getBroadcastAction());
+        localIntent.setPackage(getPackageName());
         localIntent.putExtra(SERVICE_ACTION, result);
         localIntent.putExtra(SERVICE_URL, fileUrl);
         if (message != null){
diff --git a/app/src/main/java/org/digitalcampus/oppia/service/bluetooth/BluetoothTransferService.java b/app/src/main/java/org/digitalcampus/oppia/service/bluetooth/BluetoothTransferService.java
diff --git a/app/src/main/java/org/digitalcampus/oppia/utils/MetaDataUtils.java b/app/src/main/java/org/digitalcampus/oppia/utils/MetaDataUtils.java
diff --git a/app/src/main/java/org/digitalcampus/oppia/utils/storage/FileUtils.java b/app/src/main/java/org/digitalcampus/oppia/utils/storage/FileUtils.java
diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/BaseWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/BaseWidget.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package androidTestFiles.utils.parent;`
`2`	`2`
	`3`	`+import android.content.Context;`
`3`	`4`	`import android.content.Intent;`
`4`	`5`
`5`	`6`	`import androidx.test.platform.app.InstrumentationRegistry;`
`@@ -13,6 +14,8 @@ public class NotificationsUiTest extends DaggerInjectMockUITest {`
`13`	`14`	`@After`
`14`	`15`	`public void tearDown() throws Exception {`
`15`	`16`	`Intent closeIntent = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);`
`16`		`- InstrumentationRegistry.getInstrumentation().getTargetContext().sendBroadcast(closeIntent);`
	`17`	`+ Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();`
	`18`	`+ closeIntent.setPackage(context.getPackageName());`
	`19`	`+ context.sendBroadcast(closeIntent);`
`17`	`20`	`}`
`18`	`21`	`}`