Musiccontrols optimizations, changed versionCode to 1.0.8

Author: Ferenc Nánási

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.husudosu.mpvremote"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 7
-        versionName "1.0.7"
+        versionCode 8
+        versionName "1.0.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 7,
-      "versionName": "1.0.7",
+      "versionCode": 8,
+      "versionName": "1.0.8",
       "outputFile": "app-release.apk"
     }
   ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mpv-remote",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "private": true,
   "description": "MPV remote",
   "scripts": {

src/Container.vue

@@ -159,7 +159,6 @@ export default defineComponent({
         window.plugins.intentShim.onIntent((intent) => {
           handleIntent(intent);
         });
-        // await store.dispatch("notificationController/createController");
       }
     };
 

src/api.js

@@ -2,6 +2,7 @@ import axios from "axios";
 import { toastController } from "@ionic/core";
 
 import { store } from "./store";
+import musicControls from "cordova-plugin-music-controls2/www/MusicControls";
 
 export const MINIMUM_API_VERSION = "1.0.6";
 
@@ -22,10 +23,21 @@ function requestOnRejected(error) {
   Promise.reject(error);
 }
 
-export function disconnect() {
-  store.commit("simpleapi/clearPlaybackRefreshInterval");
+// FIXME: App still creates musicController when it's disabled on settings.
+function handleDisconnect(auto_reconnect = false) {
+  if (!auto_reconnect) store.commit("simpleapi/clearPlaybackRefreshInterval");
   store.commit("simpleapi/setConnectedState", false);
   store.commit("simpleapi/clearPlayerData");
+  if (store.state.simpleapi.musicControlsActive) {
+    console.log("remove music controls");
+    store.commit("simpleapi/setMusicControlsActive", false);
+    musicControls.destroy();
+  }
+}
+
+export function disconnect() {
+  handleDisconnect();
+
   if (callsPending > 0) {
     callsPending = 0;
     cancelSource.cancel("Cancel pending requests");
@@ -41,7 +53,7 @@ export function configureInstance(host, port) {
 }
 
 apiInstance.interceptors.response.use(
-  (response) => {
+  async (response) => {
     if (!store.state.simpleapi.connected) {
       store.commit("simpleapi/setConnectedState", true);
       // Get MPV Info
@@ -56,6 +68,17 @@ apiInstance.interceptors.response.use(
           );
         }
       });
+      console.log("Reconnected");
+      // Get status after connecting immediately.
+      await apiInstance.get("/status").then((response) => {
+        console.log("Got initial status");
+        store.commit("simpleapi/setPlayerData", response.data);
+      });
+
+      if (store.getters["settings/androidNotificationEnabled"]) {
+        console.log("Handle music controls");
+        store.dispatch("simpleapi/handleMusicControls");
+      }
     }
     callsPending--;
     return response;
@@ -65,8 +88,7 @@ apiInstance.interceptors.response.use(
     // Ignore 403 if getting drives
     callsPending--;
     if (error.message == "Network Error") {
-      store.commit("simpleapi/setConnectedState", false);
-      store.commit("simpleapi/clearPlayerData");
+      handleDisconnect(true);
       return Promise.reject(error);
     } else if (
       error.response &&
@@ -88,8 +110,7 @@ apiInstance.interceptors.response.use(
       }
     } else {
       if (store.state.simpleapi.connected) {
-        store.commit("simpleapi/setConnectedState", false);
-        store.commit("simpleapi/clearPlayerData");
+        handleDisconnect(true);
       }
     }
     return Promise.reject(error);

src/components/playerController.vue

@@ -70,7 +70,8 @@ export default {
             key: "pause",
             value: !playerData.value.pause,
           });
-          musicControls.updateIsPlaying(!playerData.value.pause);
+          if (store.getters["settings/androidNotificationEnabled"] == true)
+            musicControls.updateIsPlaying(!playerData.value.pause);
         }
       });
     };

src/store/settings.module.js

@@ -13,12 +13,13 @@ import {
 import { Capacitor } from "@capacitor/core";
 import { CapacitorSQLite, SQLiteConnection } from "@capacitor-community/sqlite";
 import { useSQLite } from "vue-sqlite-hook";
-import { apiInstance, configureInstance, disconnect } from "../api";
+import { configureInstance, disconnect } from "../api";
 
 const initialState = {
   settings: {
     servers: [],
     currentServerId: null,
+    androidNotificationEnabled: false,
   },
   configured: false,
   sqlite: null,
@@ -108,17 +109,19 @@ export const settings = {
         await Storage.remove({ key: "server_port" });
       }
 
-      const androidNotificationEnabled = await Storage.get({
+      let androidNotificationEnabled = await Storage.get({
         key: "androidNotificationEnabled",
       });
-
       if (androidNotificationEnabled.value == null) {
         await dispatch("setSetting", {
           key: "androidNotificationEnabled",
           value: false,
         });
+        androidNotificationEnabled = false;
+      } else {
+        androidNotificationEnabled =
+          androidNotificationEnabled.value === "true";
       }
-
       const servers = await getServer(state.dbSession);
       const currentServerId = await Storage.get({ key: "currentServerId" });
       if (servers.length > 0) {
@@ -135,7 +138,7 @@ export const settings = {
       commit("setAppSettings", {
         servers,
         currentServerId: parseInt(currentServerId.value),
-        androidNotificationEnabled: androidNotificationEnabled.value,
+        androidNotificationEnabled: androidNotificationEnabled,
       });
     },
     setSetting: async function ({ commit }, payload) {
@@ -164,10 +167,6 @@ export const settings = {
           { root: true }
         );
         configureInstance(server.host, server.port);
-        // Get status after connecting immediately.
-        apiInstance.get("/status").then((response) => {
-          commit("simpleapi/setPlayerData", response.data, { root: true });
-        });
         // Load fileman history
         await dispatch("loadFilemanHistory");
         await dispatch(

src/store/simpleapi.module.js

@@ -42,6 +42,7 @@ const initialState = {
   musicControlsActive: false,
   musicControlStatus: {
     artist: "",
+    pause: true,
   },
 };
 
@@ -126,18 +127,23 @@ export const simpleapi = {
     },
     setMusicControlsActive(state, value) {
       state.musicControlsActive = value;
+      if (!value) state.musicControlStatus.artist = "";
     },
     setMusicControlsTitle(state, value) {
       state.musicControlStatus.artist = value;
     },
+    setMusicControlsPuasedState(state, value) {
+      state.musicControlStatus.pause = value;
+    },
   },
   actions: {
     setPlaybackRefreshInterval({ commit, state, dispatch, rootGetters }) {
       if (state.playbackRefreshInterval == null) {
         state.playbackRefreshInterval = setInterval(() => {
           apiInstance.get("/status").then((response) => {
             commit("setPlayerData", response.data);
-            if (rootGetters["settings/androidNotificationEnabled"] === true) {
+            if (rootGetters["settings/androidNotificationEnabled"] == true) {
+              console.log("handle music controls");
               dispatch("handleMusicControls");
             }
           });
@@ -150,23 +156,31 @@ export const simpleapi = {
           state.playerData["media-title"] || state.playerData.filename;
 
         if (title != state.musicControlStatus.artist) {
-          console.log("Have to change title");
-
           if (state.musicControlsActive) {
             musicControls.destroy();
             musicControls.create({ ...musicControlsSettings, track: title });
             musicControls.subscribe(musicEventHandler);
             musicControls.listen();
+            musicControls.updateIsPlaying(!state.playerData.pause);
           } else {
             musicControls.create({ ...musicControlsSettings, track: title });
             musicControls.subscribe(musicEventHandler);
             musicControls.listen();
+            musicControls.updateIsPlaying(!state.playerData.pause);
           }
           commit("setMusicControlsTitle", title);
           commit("setMusicControlsActive", true);
-          musicControls.updateIsPlaying(!state.playerData.pause);
+          /* Update isPlaying on some phones keeps sending notification to phone when it's on sleep.
+           So we have handle that by only updating when the the playback paused/unpaused*/
+          if (state.musicControlStatus.pause != state.playerData.pause) {
+            musicControls.updateIsPlaying(!state.playerData.pause);
+            commit("setMusicControlsPuasedState", state.playerData.pause);
+          }
         } else {
-          musicControls.updateIsPlaying(!state.playerData.pause);
+          if (state.musicControlStatus.pause != state.playerData.pause) {
+            musicControls.updateIsPlaying(!state.playerData.pause);
+            commit("setMusicControlsPuasedState", state.playerData.pause);
+          }
         }
       } else if (state.musicControlsActive) {
         console.log("Music controls should be destroyed");

src/views/Settings.vue

@@ -101,6 +101,7 @@ export default {
       if (!event.target.checked) {
         console.log("Remove notification if exists");
         musicControls.destroy();
+        store.commit("simpleapi/setMusicControlsActive", false);
       }
     };
     return {