refactor code with api changes

Author: jonathanbataire

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

@@ -144,7 +144,7 @@ public void onCreate(Bundle savedInstanceState) {
 		String recentNavigation = settings.getLastUrl();
 		if (isValidNavigationUrl(appUrl, recentNavigation)) {
 			container.loadUrl(recentNavigation);
-			initializeNotificationWorker(this);
+			initNotificationWorker(this);
 		}
 
 	}
@@ -238,20 +238,22 @@ protected void onActivityResult(int requestCd, int resultCode, Intent intent) {
 		}
 	}
 
-	private void initializeNotificationWorker(Context context) {
+	private void initNotificationWorker(Context context) {
 		container.setWebViewClient(new WebViewClient() {
 			@Override
 			public void onPageFinished(WebView view, String url) {
 				String jsCheckApi = "(() => typeof window.CHTCore.AndroidApi.v1.taskNotifications === 'function')();";
 				container.evaluateJavascript(jsCheckApi, new ValueCallback<String>() {
 					@Override
-					public void onReceiveValue(String s) {
-						if (!hasCheckedForNotificationApi && Objects.equals(s, "true")) {
+					public void onReceiveValue(String hasApi) {
+						if (!hasCheckedForNotificationApi && !Objects.equals(hasApi, "null")) {
 							hasCheckedForNotificationApi = true;
-							if (appNotificationManager.hasNotificationPermission()) {
+							if (Objects.equals(hasApi, "true") &&
+									appNotificationManager.hasNotificationPermission()) {
 								startNotificationWorker(context);
 							} else {
 								WorkManager.getInstance(context).cancelAllWorkByTag(NOTIFICATION_WORK_REQUEST_TAG);
+								log(this, "initNotificationWorker() :: stopped notification worker manager");
 							}
 						}
 					}

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

@@ -49,10 +49,8 @@ public Result doWork() {
 				public void onPageFinished(WebView view, String url) {
 					String js = "(async function (){" +
 							" const api = window.CHTCore.AndroidApi;" +
-							" if (api && api.v1 && api.v1.taskNotifications) {" +
-							"   const tasks = await api.v1.taskNotifications();" +
-							"   CHTNotificationBridge.onJsResult(JSON.stringify(tasks));" +
-							" }" +
+							" const tasks = await api.v1.taskNotifications();" +
+							" CHTNotificationBridge.onJsResult(JSON.stringify(tasks));" +
 							"})();";
 					view.evaluateJavascript(js, null);
 				}
@@ -99,8 +97,8 @@ public void onJsResult(String data) throws JSONException {
 				JSONObject task = dataArray.getJSONObject(i);
 				String contentText = task.getString("contentText");
 				String title = task.getString("title");
-				long authoredOn = task.getLong("authoredOn");
-				int notificationId = (int) (authoredOn % Integer.MAX_VALUE);
+				long readyAt = task.getLong("readyAt");
+				int notificationId = (int) (readyAt % Integer.MAX_VALUE);
 				appNotificationManager.showNotification(notificationId + i, title, contentText);
 			}
 			latch.countDown();