shikshalokam · vishwanath1004 · Sep 2, 2022 · Sep 6, 2022 · Sep 6, 2022 · Sep 16, 2022
diff --git a/build_config b/build_config
@@ -14,8 +14,8 @@ cordova-plugin=cordova-plugin-network-information
 cordova-plugin=cordova-plugin-statusbar
 cordova-plugin=cordova-plugin-webview-checker
 cordova-plugin=https://github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git
-cordova-plugin=https://github.com/katzer/cordova-plugin-local-notifications.git
-cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-3.4.0
+cordova-plugin=git+https://github.com/fquirin/cordova-plugin-local-notifications.git
+cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-5.0.2
 cordova-plugin=cordova-plugin-advanced-http
 cordova-plugin=cordova-plugin-android-permissions
 cordova-plugin=cordova.plugins.diagnostic

diff --git a/config.xml b/config.xml
@@ -10,6 +10,7 @@
     <allow-intent href="geo:*" />
     <preference name="ScrollEnabled" value="false" />
     <preference name="android-minSdkVersion" value="22" />
+    <preference name="android-targetSdkVersion" value="31" />
     <preference name="BackupWebStorage" value="none" />
     <preference name="SplashScreenDelay" value="5000" />
     <preference name="Orientation" value="portrait" />
@@ -147,10 +148,7 @@
     <plugin name="cordova-plugin-statusbar" spec="^2.4.3" />
     <plugin name="cordova-plugin-webview-checker" spec="^1.0.1" />
     <plugin name="cordova-plugin-awesome-shared-preferences" spec="https://github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git" />
-    <plugin name="cordova-plugin-local-notification" spec="https://github.com/katzer/cordova-plugin-local-notifications.git">
-        <variable name="ANDROID_SUPPORT_V4_VERSION" value="26.+" />
-    </plugin>
-    <plugin name="cordova-plugin-fcm-with-dependecy-updated" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-3.4.0">
+    <plugin name="cordova-plugin-fcm-with-dependecy-updated" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-5.0.2">
         <variable name="FCM_CORE_VERSION" value="16.0.9" />
         <variable name="FCM_VERSION" value="18.0.0" />
         <variable name="GRADLE_TOOLS_VERSION" value="3.5.0" />

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "@angular/router": "^9.1.13",
     "@ionic-native/android-permissions": "^5.30.0",
     "@ionic-native/app-version": "^5.15.1",
-    "@ionic-native/camera": "^5.30.0",
+    "@ionic-native/camera": "^5.36.0",
     "@ionic-native/chooser": "^5.30.0",
     "@ionic-native/core": "^5.15.1",
     "@ionic-native/device": "^5.15.1",
@@ -69,12 +69,13 @@
     "@project-sunbird/content-player": "4.4.0",
     "@project-sunbird/discussions-ui-v8": "2.6.0-beta.2",
     "@project-sunbird/sb-dashlet": "1.0.4",
+    "@project-sunbird/sb-notification": "^5.0.1",
     "@project-sunbird/sb-styles": "0.0.9",
     "@project-sunbird/sunbird-epub-player-v9": "4.8.1",
     "@project-sunbird/sunbird-pdf-player-v9": "4.8.1",
     "@project-sunbird/sunbird-quml-player-v9": "5.0.2",
-    "@project-sunbird/sunbird-video-player-v9": "5.0.4",
     "@project-sunbird/sunbird-sdk": "5.0.0",
+    "@project-sunbird/sunbird-video-player-v9": "5.0.4",
     "chart.js": "^2.9.4",
     "chartjs-plugin-datalabels": "^0.7.0",
     "chartjs-plugin-stacked100": "^0.7.1",
@@ -88,7 +89,7 @@
     "cordova-plugin-androidx-adapter": "^1.1.3",
     "cordova-plugin-appavailability": "^0.4.2",
     "cordova-plugin-badge": "^0.8.8",
-    "cordova-plugin-camera": "^5.0.1",
+    "cordova-plugin-camera": "^6.0.0",
     "cordova-plugin-chooser": "^1.3.2",
     "cordova-plugin-code-push": "^1.13.1",
     "cordova-plugin-device": "^2.0.3",
@@ -147,7 +148,6 @@
     "pouchdb-adapter-cordova-sqlite": "^2.0.7",
     "pouchdb-find": "^7.2.2",
     "rxjs": "^6.6.3",
-    "sb-notification": "0.0.2",
     "sb-svg2pdf": "0.0.10",
     "sb-tag-manager": "^3.9.19",
     "tslib": "^1.10.0",
@@ -201,7 +201,7 @@
     "cordova-plugin-fcm-with-dependecy-updated": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-3.4.0",
     "cordova-plugin-file-support": "git+https://github.com/project-sunbird/cordova-plugin-file-support.git#release-1.15.0",
     "cordova-plugin-inappupdatemanager": "git+https://github.com/subranil/cordova-plugin-inappupdatemanager.git#release-3.7.0",
-    "cordova-plugin-local-notification": "git+https://github.com/katzer/cordova-plugin-local-notifications.git",
+    "cordova-plugin-local-notification": "git+https://github.com/fquirin/cordova-plugin-local-notifications.git",
     "cordova-plugin-openrap": "git+https://github.com/project-sunbird/cordova-plugin-openrap.git",
     "cordova-plugin-proguard": "git+https://github.com/greybax/cordova-plugin-proguard.git",
     "cordova-plugin-qr-scanner": "git+https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-4.6.0",
@@ -279,7 +279,9 @@
       "cordova-plugin-androidx-adapter": {},
       "cordova-plugin-secure-storage-echo": {},
       "cordova-plugin-appavailability": {},
-      "cordova-plugin-camera": {},
+      "cordova-plugin-camera": {
+        "ANDROIDX_CORE_VERSION": "1.6.+"
+      },
       "cordova-plugin-filepath": {},
       "cordova-plugin-chooser": {},
       "cordova-plugin-filepicker": {},
@@ -369,4 +371,4 @@
       "<rootDir>/src/app/manage-learn/"
     ]
   }
-}
+}
diff --git a/scripts/android/android-10-migration-fix.js b/scripts/android/android-10-migration-fix.js
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+const shell = require('child_process').execSync
+var pathList = [
+    "platforms/android/cordova-plugin-badge/app-badge.gradle",
+    "platforms/android/com-sarriaroman-photoviewer/app-photoviewer.gradle",
+    "platforms/android/cordova-plugin-code-push/app-build-extras.gradle",
+    "platforms/android/cordova-plugin-local-notification/app-localnotification.gradle",
+]
+for (let i = 0; i < pathList.length; i++) {
+    try {
+        if(process.platform == "darwin") {
+            shell(`sed -i "" "s!compile!implementation!g" ${pathList[i]}`)
+        } else {
+            shell(`sed -i "s!compile!implementation!g" ${pathList[i]}`)
+        }
+    }
+    catch(err) {
+        console.log('error on script plugins ', pathList[i] + ' - ' + err);
+    }
+  }
diff --git a/src/__tests__/setup.js b/src/__tests__/setup.js
@@ -72,7 +72,19 @@ global.splashscreen = {
     markImportDone: () => { },
     hide: () => { },
     clearPrefs: () => { },
-    setContent: () => { }
+    setContent: () => { },
+    getActions: (data) => {data(JSON.stringify([
+        {
+            type: 'TELEMETRY',
+            payload: 'sample-payload'
+        }, {
+            type: 'IMPORT',
+            payload: 'sample-payload'
+        }, {
+            type: 'DEEPLINK',
+            payload: 'payload'
+        }
+    ]))}
 }
 
 global.codePush = {

diff --git a/src/app.scss b/src/app.scss
@@ -801,6 +801,10 @@ ion-toast.green-toast{
   --background: #{map-get($colors, office_green)};
 }
 
+ion-toast.red-toast{
+  --background: #{map-get($colors, vivid_red)};
+}
+
 .btn-block {
   margin: 0 !important;
   position: relative;
@@ -2151,7 +2155,7 @@ ion-icon.mg-popup-btn-icon.md.hydrated{
     }
   }
   .segment-button-has-label-only.segment-button-layout-icon-top.ion-activatable.ion-activatable-instant.ion-focusable.hydrated.segment-button-checked ion-label {
-    color: white !important;
+    color: black !important;
   }
 }
 

diff --git a/src/app/animations/animation-shrink-out-top-right.ts b/src/app/animations/animation-shrink-out-top-right.ts
@@ -10,7 +10,6 @@ export const animationShrinkOutTopRight: AnimationBuilder = (baseEl: HTMLElement
     const wrapperAnimation = createAnimation();
     const wrapperEl = baseEl.querySelector('.popover-wrapper');
     wrapperAnimation.addElement(wrapperEl);
-    const wrapperElRect = wrapperEl!.getBoundingClientRect();
 
     wrapperAnimation
         .beforeStyles({

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -259,7 +259,7 @@ export class AppComponent implements OnInit, AfterViewInit {
   }
 
   checkAndroidWebViewVersion() {
-    var that = this;
+    let that = this;
     plugins['webViewChecker'].getCurrentWebViewPackageInfo()
       .then(function (packageInfo) {
         that.formAndFrameworkUtilService.getWebviewConfig().then(function (webviewVersion) {
@@ -332,19 +332,19 @@ export class AppComponent implements OnInit, AfterViewInit {
   }
 
   private syncStatus(status) {
+    let value = new Map();
     switch (status) {
       case SyncStatus.DOWNLOADING_PACKAGE:
-        const value = new Map();
         value['codepushUpdate'] = 'downloading-package';
         break;
       case SyncStatus.INSTALLING_UPDATE:
-        const value1 = new Map();
-        value1['codepushUpdate'] = 'installing-update';
+        value['codepushUpdate'] = 'installing-update';
         break;
       case SyncStatus.ERROR:
-        const value2 = new Map();
-        value2['codepushUpdate'] = 'error-in-update';
+        value['codepushUpdate'] = 'error-in-update';
     }
+    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.OTHER, InteractSubtype.HOTCODE_PUSH_INITIATED,
+      Environment.HOME, PageId.HOME, null, value);
   }
 
   private downloadProgress(downloadProgress) {
@@ -723,13 +723,13 @@ export class AppComponent implements OnInit, AfterViewInit {
     const selectedLanguage = await this.preferences.getString(PreferenceKey.SELECTED_LANGUAGE_CODE).toPromise();
     window['segmentation'].SBTagService.pushTag([selectedLanguage], TagPrefixConstants.USER_LANG, true);
     if (selectedLanguage) {
-      await this.translate.use(selectedLanguage);
+      this.translate.use(selectedLanguage);
     }
   }
 
   private async makeEntryInSupportFolder() {
     return new Promise<void>((resolve => {
-      (window as any).sbutility.makeEntryInSunbirdSupportFile((result) => {
+      (window).sbutility.makeEntryInSunbirdSupportFile((result) => {
         this.preferences.putString(PreferenceKey.KEY_SUNBIRD_SUPPORT_FILE_PATH, result).toPromise().then();
         resolve();
       }, () => {
@@ -749,7 +749,7 @@ export class AppComponent implements OnInit, AfterViewInit {
   private async startOpenrapDiscovery(): Promise<undefined> {
     if (this.appGlobalService.OPEN_RAPDISCOVERY_ENABLED) {
       return new Observable((observer) => {
-        (window as any).openrap.startDiscovery(
+        (window).openrap.startDiscovery(
           (response: { ip: string, actionType: 'connected' | 'disconnected' }) => {
             observer.next(response);
           }, (e) => {
@@ -1071,8 +1071,6 @@ export class AppComponent implements OnInit, AfterViewInit {
     this.preferences.addListener(CsClientStorage.TRACE_ID, (value) => {
       if (value) {
         // show toast
-      } else {
-        // do not show the toast.
       }
     });
   }

diff --git a/src/app/category-list/category-list-page.ts b/src/app/category-list/category-list-page.ts
@@ -1,4 +1,3 @@
-import { PreferenceKey } from './../app.constant';
 import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
 import {
     AppHeaderService,
@@ -31,7 +30,6 @@ import { ContentUtil } from '@app/util/content-util';
 import { ProfileConstants, RouterLinks } from '@app/app/app.constant';
 import { NavigationService } from '@app/services/navigation-handler.service';
 import { ScrollToService } from '@app/services/scroll-to.service';
-import { FormConstants } from '@app/app/form.constants';
 import { ModalController } from '@ionic/angular';
 import { SearchFilterPage } from '@app/app/search-filter/search-filter.page';
 import { FormControl, FormGroup } from '@angular/forms';
@@ -485,7 +483,6 @@ export class CategoryListPage implements OnInit, OnDestroy {
     async onPrimaryFacetFilterSelect(primaryFacetFilter: { code: string }, toApply: FilterValue[]) {
         const appliedFilterCriteria: ContentSearchCriteria = this.deduceFilterCriteria();
         const facetFilter = appliedFilterCriteria.facetFilters.find(f => f.name === primaryFacetFilter.code);
-        const onSelectedFilter = [];
         if (facetFilter) {
             facetFilter.values.forEach(facetFilterValue => {
                 if (toApply.find(apply => facetFilterValue.name === apply.name)) {
@@ -494,9 +491,6 @@ export class CategoryListPage implements OnInit, OnDestroy {
                     facetFilterValue.apply = false;
                 }
             });
-            toApply.forEach((selectedValue) => {
-                onSelectedFilter.push(selectedValue.name);
-            });
 
             await this.applyFilter(appliedFilterCriteria, true, toApply);
         }

diff --git a/src/app/collection-detail-etb/collection-detail-etb.page.ts b/src/app/collection-detail-etb/collection-detail-etb.page.ts
@@ -1325,9 +1325,7 @@ export class CollectionDetailEtbPage implements OnInit {
     this.router.navigate([RouterLinks.ACTIVE_DOWNLOADS]);
   }
 
-  async onFilterMimeTypeChange(val, idx, currentFilter?) {
-    const values = new Map();
-    values['filter'] = currentFilter;
+  async onFilterMimeTypeChange(val, idx, currentFilter?) {  
     this.activeMimeTypeFilter = val;
     this.currentFilter = this.commonUtilService.translateMessage(currentFilter);
     this.mimeTypes.forEach((type) => {
@@ -1359,8 +1357,6 @@ export class CollectionDetailEtbPage implements OnInit {
     this.shownGroups = undefined;
     this.navService.navigateTo([`/${RouterLinks.COLLECTION_DETAIL_ETB}/${RouterLinks.TEXTBOOK_TOC}`],
       { childrenData: this.childrenData, parentId: this.identifier });
-    const values = new Map();
-    values['selectChapterVisible'] = this.isChapterVisible;
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.DROPDOWN_CLICKED,

diff --git a/src/app/collection-detail-etb/textbook-toc-service.ts b/src/app/collection-detail-etb/textbook-toc-service.ts
@@ -11,7 +11,9 @@ export class TextbookTocService {
     };
 
     constructor(
-    ) { }
+    ) { 
+        console.log('textbook-toc-service');    
+    }
 
     setTextbookIds(textbookIds) {
         this.textbookIds = textbookIds;

diff --git a/src/app/components/application-header/application-header.component.ts b/src/app/components/application-header/application-header.component.ts
@@ -15,7 +15,7 @@ import { filter, map } from 'rxjs/operators';
 import {
   CachedItemRequestSourceFrom,
   CorrelationData, DownloadEventType, DownloadProgress, DownloadService,
-  EventNamespace, EventsBusService, NotificationService as PushNotificationService, NotificationStatus,
+  EventNamespace, EventsBusService, NotificationService as PushNotificationService,
   Profile, ProfileService, ProfileType,
   ServerProfile, SharedPreferences, UserFeedStatus
 } from 'sunbird-sdk';
@@ -283,7 +283,6 @@ export class ApplicationHeaderComponent implements OnInit, OnDestroy {
   }
 
   emitSideMenuItemEvent($event, menuItem) {
-    // this.toggleMenu();
     this.menuCtrl.close().then(() => {
       this.sideMenuItemEvent.emit({ menuItem });
     }).catch((e) => {