sonar error

Author: jonathanbataire

src/main/java/org/medicmobile/webapp/mobile/AppNotificationManager.java

@@ -41,13 +41,10 @@ public boolean hasNotificationPermission() {
   }
 
   public void requestNotificationPermission() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-      if (context instanceof Activity activity) {
-        if (!hasNotificationPermission()) {
-          ActivityCompat.requestPermissions(activity,
-                  new String[]{Manifest.permission.POST_NOTIFICATIONS}, REQUEST_NOTIFICATION_PERMISSION);
-        }
-      }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
+            context instanceof Activity activity && !hasNotificationPermission()) {
+      ActivityCompat.requestPermissions(activity,
+              new String[]{Manifest.permission.POST_NOTIFICATIONS}, REQUEST_NOTIFICATION_PERMISSION);
     }
   }
 

src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java

@@ -56,7 +56,7 @@ public class EmbeddedBrowserActivity extends Activity {
   private AppNotificationManager appNotificationManager;
   private boolean isMigrationRunning = false;
   private boolean hasCheckedForNotificationApi = false;
-  private final String NOTIFICATION_WORK_REQUEST_TAG = "cht_notification_tag";
+  private static final String NOTIFICATION_WORK_REQUEST_TAG = "cht_notification_tag";
 
   private static final ValueCallback<String> IGNORE_RESULT = new ValueCallback<String>() {
     public void onReceiveValue(String result) { /* ignore */ }

src/main/java/org/medicmobile/webapp/mobile/NotificationWorker.java

@@ -24,7 +24,7 @@
 import java.util.concurrent.TimeUnit;
 
 public class NotificationWorker extends Worker {
-  final String TAG = "NOTIFICATION_WORKER";
+  final static String TAG = "NOTIFICATION_WORKER";
   final int EXECUTION_TIMEOUT = 20;
 
   public NotificationWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
@@ -45,6 +45,7 @@ public Result doWork() {
       enableStorage(webView);
 
       webView.setWebViewClient(new WebViewClient() {
+        @Override
         public void onPageFinished(WebView view, String url) {
           String js = "(async function (){" +
                   " const api = window.CHTCore.AndroidApi;" +
@@ -112,7 +113,7 @@ private JSONArray parseData(String data) {
         return new JSONArray(data);
       } catch (JSONException e) {
         log(e, "error parsing JS data");
-        throw new RuntimeException(e);
+        return new JSONArray();
       }
     }
   }