Skip to content

Commit

Permalink
Merge pull request #1643 from RADAR-base/patch-release
Browse files Browse the repository at this point in the history
Release 2.6.4
  • Loading branch information
mpgxvii authored Feb 8, 2023
2 parents fbc1ddb + 63ae82a commit 5beed0b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ export const DefaultEndPoint = 'https://your-hosted-radar-platform-base-url/'
The default appserver configs.

```ts
// The notification type (either 'FCM_REST' or 'LOCAL' notifications, NOTE: 'FCM_XMPP' support was removed in v3.0.0)
// The notification type (either 'FCM_REST' or 'LOCAL' notifications, NOTE: 'FCM_XMPP' support was removed in v2.6.4)
export const DefaultNotificationType: string = 'FCM_REST'

// App server URL
Expand Down
7 changes: 6 additions & 1 deletion config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<allow-intent href="market:*" />
<preference name="AndroidLaunchMode" value="singleTop" />
<preference name="AndroidXEnabled" value="true" />
<preference name="android-minSdkVersion" value="22" />
<preference name="android-targetSdkVersion" value="31" />
<preference name="android-compileSdkVersion" value="31" />
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
Expand Down Expand Up @@ -56,6 +57,7 @@
<config-file parent="/manifest/" target="app/src/main/AndroidManifest.xml">
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
</config-file>
<custom-preference name="android-manifest/application/@android:requestLegacyExternalStorage" value="true" />
</platform>
<platform name="ios">
<feature name="CDVWKWebViewEngine">
Expand Down Expand Up @@ -148,8 +150,11 @@
<plugin name="phonegap-plugin-barcodescanner" spec="^8.1.0">
<variable name="ANDROID_SUPPORT_V4_VERSION" value="27.+" />
</plugin>
<plugin name="cordova-plugin-firebasex" spec="15.0.0-cli">
<variable name="IOS_SHOULD_ESTABLISH_DIRECT_CHANNEL" value="true" />
</plugin>
<plugin name="cordova-plugin-background-mode" spec="https://bitbucket.org/TheBosZ/cordova-plugin-run-in-background.git" />
<plugin name="com-darryncampbell-cordova-plugin-intent" spec="^2.0.0" />
<plugin name="com-darryncampbell-cordova-plugin-intent" spec="git+https://github.com/mpgxvii/darryncampbell-cordova-plugin-intent.git" />
<plugin name="cordova-plugin-ionic-keyboard" spec="^2.2.0" />
<plugin name="cordova-plugin-ionic-webview" spec="^4.2.1" />
</widget>
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ import { LogService } from '../misc/log.service'
import { StorageService } from '../storage/storage.service'
import { NotificationService } from './notification.service'

declare var FirebasePlugin

@Injectable()
export abstract class FcmNotificationService extends NotificationService {
FCM_TOKEN: string
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/home/containers/home-page.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export class HomePageComponent implements OnInit, OnDestroy {
this.usage.sendClickEvent('open_on_demand_tasks')
}

startQuestionnaire(taskCalendarTask: Task) {
startQuestionnaire(taskCalendarTask?: Task) {
// NOTE: User can start questionnaire from task calendar or start button in home.
const task = taskCalendarTask ? taskCalendarTask : this.nextTask

Expand Down

0 comments on commit 5beed0b

Please sign in to comment.