Merge pull request #25 from taras-omelchuk/file-transfer

FileTransfer plugin v1.3.0
blackberry · May 25, 2022 · 093337a · 093337a
2 parents eab16ca + 4f96e47
commit 093337a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-bbd-file-transfer",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "BlackBerry Dynamics Cordova File Transfer Plugin",
   "types": "./types/index.d.ts",
   "license": "SEE LICENSE IN LICENSE",
@@ -14,7 +14,7 @@
   },
   "repository": {
     "name": "cordova-plugin-bbd-file-transfer",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "private": true,
     "type": "git",
     "url": "https://github.com/blackberry/BlackBerry-Dynamics-Cordova-Plugins/tree/file-transfer"

diff --git a/plugin.xml b/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  Copyright (c) 2021 BlackBerry Limited. All Rights Reserved.
+  Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
   Some modifications to the original cordova-plugin-file-transfer
   from https://github.com/apache/cordova-plugin-file-transfer/
 
@@ -23,7 +23,7 @@
   under the License.
 -->
 
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-bbd-file-transfer" version="1.2.0">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-bbd-file-transfer" version="1.3.0">
     <name>cordova-plugin-bbd-file-transfer</name>
     <description>BlackBerry Dynamics Cordova File Transfer Plugin</description>
     <license>SEE LICENSE IN LICENSE</license>
@@ -35,7 +35,7 @@
         Original Cordova FileTransfer plugin link: https://github.com/apache/cordova-plugin-file-transfer
     </info>
 
-    <dependency id="cordova-plugin-bbd-file" url="git+https://github.com/blackberry/blackberry-dynamics-cordova-plugins#file" version="^1.2.0" />
+    <dependency id="cordova-plugin-bbd-file" url="git+https://github.com/blackberry/blackberry-dynamics-cordova-plugins#file" version="^1.3.0" />
 
     <js-module src="www/FileTransferError.js" name="FileTransferError">
         <clobbers target="window.FileTransferError" />

diff --git a/src/ios/CDVFileTransferBD.m b/src/ios/CDVFileTransferBD.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2021 BlackBerry Limited. All Rights Reserved.
+ Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
  Some modifications to the original Cordova FileTransfer plugin
  from https://github.com/apache/cordova-plugin-file-transfer/
  
@@ -31,7 +31,12 @@ Licensed to the Apache Software Foundation (ASF) under one
 #import <CFNetwork/CFNetwork.h>
 
 #import <BlackBerryDynamics/GD/GDFileManager.h>
+
+#ifdef BBD_CAPACITOR
+#import "GDCordovaLogger.h"
+#else
 #import <BbdBasePlugin/GDCordovaLogger.h>
+#endif
 
 #ifndef DLog
 #ifdef DEBUG