Ue CapacitorHttp globally

6c65726f79 · Mar 12, 2023 · e2aca9f · e2aca9f
1 parent c5dabe0
commit e2aca9f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/android/app/src/main/assets/capacitor.config.json b/android/app/src/main/assets/capacitor.config.json
@@ -11,6 +11,9 @@
 		},
 		"Keyboard": {
 			"resize": "native"
+		},
+		"CapacitorHttp": {
+			"enabled": true
 		}
 	},
 	"cordova": {}

diff --git a/capacitor.config.json b/capacitor.config.json
@@ -11,6 +11,9 @@
     },
     "Keyboard": {
       "resize": "native"
+    },
+    "CapacitorHttp": {
+      "enabled": true
     }
   },
   "cordova": {}

diff --git a/electron/capacitor.config.json b/electron/capacitor.config.json
@@ -11,6 +11,9 @@
     },
     "Keyboard": {
       "resize": "native"
+    },
+    "CapacitorHttp": {
+      "enabled": true
     }
   },
   "cordova": {}

diff --git a/src/services/TransmissionRPC.ts b/src/services/TransmissionRPC.ts
@@ -2,8 +2,6 @@
  * Transmission RPC Client for Ionic/Capacitor, inspired by kkito-transmission-rpc
 */
 
-import { CapacitorHttp } from '@capacitor/core';
-import { isPlatform  } from '@ionic/vue';
 import * as _ from 'lodash';
 
 declare const Buffer: any
@@ -25,15 +23,13 @@ class TRPC {
   sessionArguments: any;
   options: any;
   lastRequestId: number;
-  useNativePlugin: boolean;
   persistentData: any;
   persistentDataValid=false;
   sessionStats: any;
   statsHistory: Array<Array<number|null>>=[];
   pathMapping: Record<string,string>;
 
   constructor() {
-    this.useNativePlugin = (isPlatform("capacitor") && (isPlatform("android") || isPlatform("ios")))
     this.lastRequestId = 0;
     this.pathMapping = {};
   }
@@ -482,7 +478,7 @@ class TRPC {
       ret = await this.electronRequest(options,datas);
     }
     else {
-      ret = await this.nativePluginRequest(requestUrl,options,datas);
+      ret = await this.browserRequest(requestUrl,options,datas);
     }
 
     // Don't return result if tags doesn't match or server has been changed
@@ -498,7 +494,7 @@ class TRPC {
     return ret;
   }
 
-   async nativePluginRequest(requestUrl: string, options: any, datas: Record<string, any>) {
+  /*async nativePluginRequest(requestUrl: string, options: any, datas: Record<string, any>) {
     // HTTP request using CapacitorHttp (allow CORS)
     let result: Record<string, any>={};
     options.data = datas
@@ -521,7 +517,7 @@ class TRPC {
     });
 
     return result;
-  }
+  }*/
 
   async electronRequest(options: any, datas: Record<string, any>) {
     // HTTP request using Electron net (allow CORS)
@@ -551,7 +547,7 @@ class TRPC {
   }
 
   async browserRequest(requestUrl: string, options: any, datas: Record<string, any>) {
-    // HTTP request using fetch (no CORS)
+    // HTTP request using fetch or CapacitorHttp
     let result: Record<string, any>={};
     options.body = JSON.stringify(datas);