remove deprecated functions

Author: m-abs

demo/package.json

@@ -20,6 +20,7 @@
     "typescript": "^3.7.5"
   },
   "scripts": {
+    "tslint": "tslint --config '../tslint.json' -p tsconfig.json 'app/**/*.ts' --exclude '**/node_modules/**'",
     "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**'"
   }
 }

package.json

@@ -17,7 +17,7 @@
     "lint": "npm-run-all format:check tslint",
     "test.android": "(cd src && npm i && npx tsc) && npm run tslint && cd demo && tns build android && tns test android --justlaunch",
     "test.ios": "(cd src && npm i && npx tsc) && npm run tslint && cd demo && tns build ios && tns test ios --justlaunch",
-    "tslint": "tslint 'src/**/*.ts' 'demo/src/**/*.ts' --config tslint.json --exclude \"**/node_modules/**\"",
+    "tslint": "(cd src && npm run tslint) && (cd demo && npm run tslint)",
     "postinstall": "cd src && ([ \"$npm_config_refer\" = \"ci\" ] && npm ci || npm i)"
   },
   "repository": {
@@ -51,7 +51,6 @@
     "prettier": "^1.19.1",
     "rimraf": "^3.0.2",
     "tns-platform-declarations": "^6.3.2",
-    "tslint": "^6.0.0",
     "typescript": "^3.7.5"
   },
   "dependencies": {}

src/audioplayer.ios.ts

@@ -1,9 +1,10 @@
 /// <reference path="./native-definitions/ios.d.ts" />
 
-import { ImageSource, isFileOrResourcePath } from '@nativescript/core/image-source';
+import { ImageSource } from '@nativescript/core/image-source';
 import * as trace from '@nativescript/core/trace';
+import * as utils from '@nativescript/core/utils/utils';
 import { CommonAudioPlayer } from './audioplayer-common';
-import { MediaTrack, notaAudioCategory, PlaybackEvent, Playlist } from './audioplayer.types';
+import { MediaTrack, notaAudioCategory, Playlist } from './audioplayer.types';
 
 class AudioPlayerDelegateImpl extends NSObject implements AudioPlayerDelegate {
   public static ObjCProtocols = [AudioPlayerDelegate];
@@ -511,7 +512,7 @@ export class TNSAudioPlayer extends CommonAudioPlayer {
     this._isRetrievingArtwork = true;
 
     try {
-      const image = isFileOrResourcePath(artworkUrl) ? ImageSource.fromFileOrResourceSync(artworkUrl) : await ImageSource.fromUrl(artworkUrl);
+      const image = utils.isFileOrResourcePath(artworkUrl) ? ImageSource.fromFileOrResourceSync(artworkUrl) : await ImageSource.fromUrl(artworkUrl);
       if (this.getCurrentMediaTrack()?.albumArtUrl === artworkUrl) {
         const artwork = MPMediaItemArtwork.alloc().initWithImage(image.ios);
         this._cachedCover = { url: artworkUrl, artwork };

src/media-service.android.ts

@@ -176,40 +176,45 @@ export namespace dk {
         return this._playlist?.tracks?.[index];
       }
 
+      private lastPosition: number;
+      private lastWindowIndex: number;
+      private _handleTimeChange() {
+        const player = this.exoPlayer;
+        if (!player) {
+          if (trace.isEnabled()) {
+            trace.write(`${this.cls}._onPlaying() - no player stop timeChangeInterval`, notaAudioCategory);
+          }
+
+          clearInterval(this._timeChangeInterval);
+
+          return;
+        }
+
+        const windowIndex = player.getCurrentWindowIndex();
+        let position = player.getCurrentPosition();
+        const duration = player.getDuration();
+
+        if (this.lastPosition !== position || this.lastWindowIndex !== windowIndex) {
+          this.owner?._onTimeChanged(position, duration, windowIndex);
+
+          this.lastPosition = position;
+          this.lastWindowIndex = windowIndex;
+        }
+      }
+
       public _onPlaying() {
         if (trace.isEnabled()) {
           trace.write(`${this.cls}._onPlaying()`, notaAudioCategory);
         }
         clearInterval(this._timeChangeInterval);
 
-        let lastCurrentTime: number;
-        let lastPlaylistIndex: number;
         this._timeChangeInterval = setInterval(() => {
-          const exoPlayer = this.exoPlayer;
-          if (!exoPlayer) {
-            if (trace.isEnabled()) {
-              trace.write(`${this.cls}._onPlaying() - no player stop timeChangeInterval`, notaAudioCategory);
-            }
-
-            clearInterval(this._timeChangeInterval);
-
-            return;
-          }
-
-          const currentPlaylistIndex = exoPlayer.getCurrentWindowIndex();
-          const currentTime = exoPlayer.getCurrentPosition();
-          const duration = exoPlayer.getDuration();
-
-          if (lastCurrentTime !== currentTime || lastPlaylistIndex !== currentPlaylistIndex) {
-            this.owner?._onTimeChanged(currentTime, duration, currentPlaylistIndex);
-
-            lastCurrentTime = currentTime;
-            lastPlaylistIndex = currentPlaylistIndex;
-          }
+          this._handleTimeChange();
         }, 100);
 
         this._mediaSession?.setActive(true);
 
+        this._handleTimeChange();
         this.owner?._onPlaying();
       }
 
@@ -368,20 +373,13 @@ export namespace dk {
           trace.write(`${this.cls}.onStartCommand(${intent}, ${flags}, ${startId})`, notaAudioCategory);
         }
 
-        if (android.os.Build.VERSION.SDK_INT >= 24 && this._mediaSession) {
+        if (this._mediaSession) {
           androidx.media.session.MediaButtonReceiver.handleIntent(this._mediaSession, intent);
         }
 
         return super.onStartCommand(intent, flags, startId);
       }
 
-      public onStart(intent: android.content.Intent, startId: number) {
-        if (trace.isEnabled()) {
-          trace.write(`${this.cls}.onStart(${intent}, ${startId})`, notaAudioCategory);
-        }
-        super.onStart(intent, startId);
-      }
-
       public setOwner(owner: TNSAudioPlayer) {
         if (trace.isEnabled()) {
           trace.write(`${this.cls}.setOwner()`, notaAudioCategory);
@@ -1164,6 +1162,14 @@ function ensureNativeClasses() {
       return global.__native(this);
     }
 
+    public onNotificationPosted(notificationId: number, notification: android.app.Notification, ongoing?: boolean) {
+      if (trace.isEnabled()) {
+        trace.write(`${this.cls}.onNotificationPosted(${notificationId}, ${notification}, ${ongoing})`, notaAudioCategory);
+      }
+
+      this.owner?._handleNotificationPosted(notificationId, notification);
+    }
+
     public onNotificationCancelled(notificationId: number, dismissedByUser?: boolean) {
       if (trace.isEnabled()) {
         trace.write(`${this.cls}.NotificationListener(id=${notificationId}, dismissedByUser=${dismissedByUser})`, notaAudioCategory);
@@ -1180,26 +1186,6 @@ function ensureNativeClasses() {
 
       this.owner?.stopSelf();
     }
-    public onNotificationPosted(notificationId: number, notification: android.app.Notification, ongoing?: boolean) {
-      if (trace.isEnabled()) {
-        trace.write(`${this.cls}.onNotificationPosted(${notificationId}, ${notification}, ${ongoing})`, notaAudioCategory);
-      }
-
-      this.owner?._handleNotificationPosted(notificationId, notification);
-    }
-
-    public onNotificationStarted(notificationId: number, notification: android.app.Notification) {
-      // Deprecated
-      if (trace.isEnabled()) {
-        trace.write(
-          `${this.cls}.onNotificationStarted(${notificationId}, ${notification}) is deprecated - why was this called?`,
-          notaAudioCategory,
-          trace.messageType.warn,
-        );
-      }
-
-      this.owner?._handleNotificationPosted(notificationId, notification);
-    }
   }
 
   TNSNotificationListener = TNSNotificationListenerImpl;

src/package.json

@@ -39,7 +39,7 @@
   "readmeFilename": "README.md",
   "scripts": {
     "format:check": "prettier -c --config $(git rev-parse --show-toplevel)/.prettierrc.json './**/*.ts'",
-    "tslint": "tslint './**/*.ts' --config $(git rev-parse --show-toplevel)/tslint.json --exclude \"**/node_modules/**\"",
+    "tslint": "tslint './**/*.ts' --config $(git rev-parse --show-toplevel)/tslint.json -p tsconfig.json --exclude \"**/node_modules/**\"",
     "lint": "npm-run-all format:check tslint",
     "build": "tsc"
   },

src/tsconfig.json

@@ -21,7 +21,7 @@
         "noImplicitReturns": true,
         "noImplicitUseStrict": false,
         "noFallthroughCasesInSwitch": true,
-        "incremental": true,
+        "incremental": true
     },
     "exclude": [
         "node_modules",

tslint.json

@@ -7,6 +7,7 @@
         ]
     },
     "rules": {
+        "deprecation": true,
         "no-return-await": true,
         "newline-before-return": true,
         "no-console": true,