updated to go back to old email plugin to remove GET_ACCOUNT permission

5 files changed, 11 insertions, 38 deletions

diff --git a/.DS_Store b/.DS_Store
index 562cffbe..14b69209 100644
--- a/.DS_Store
+++ b/.DS_Store
diff --git a/config.xml b/config.xml
index 369e05d8..61960333 100644
--- a/config.xml
+++ b/config.xml
@@ -9,6 +9,7 @@
     </author>
     <content src="index.html" />
     <access launch-external="yes" origin="mailto:*" />
+    <allow-intent href="mailto:*" />
     <allow-navigation href="*" />
     <preference name="AndroidPersistentFileLocation" value="Compatibility" />
     <preference name="iosPersistentFileLocation" value="Library" />
@@ -96,6 +97,7 @@
     <preference name="SplashShowOnlyFirstTime" value="false" />
     <engine name="android" spec="^6.2.3" />
     <engine name="ios" spec="^4.4.0" />
+    <plugin name="com.jcjee.plugins.emailcomposer" spec="https://github.com/pliablepixels/email-composer" />
     <plugin name="com.telerik.plugins.nativepagetransitions" spec="^0.6.5" />
     <plugin name="cordova-library-helper" spec="^1.0.4">
         <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="Save media to your Camera Roll" />
@@ -110,7 +112,6 @@
         <variable name="URL_SCHEME" value="zmninja" />
     </plugin>
     <plugin name="cordova-plugin-device" spec="^1.1.6" />
-    <plugin name="cordova-plugin-email" spec="^1.2.6" />
     <plugin name="cordova-plugin-file" spec="^4.3.3" />
     <plugin name="cordova-plugin-file-transfer" spec="^1.6.3" />
     <plugin name="cordova-plugin-globalization" spec="^1.0.7" />
diff --git a/package-lock.json b/package-lock.json
index 64ced544..2ed8c36b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -612,11 +612,6 @@
             "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-1.1.6.tgz",
             "integrity": "sha1-LSF2TK18m4AVI+TgmjDgJLJJM0s="
         },
-        "cordova-plugin-email": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/cordova-plugin-email/-/cordova-plugin-email-1.2.6.tgz",
-            "integrity": "sha1-+1M6Sq7CnVcRAsySghlNMtnCFkI="
-        },
         "cordova-plugin-file": {
             "version": "4.3.3",
             "resolved": "https://registry.npmjs.org/cordova-plugin-file/-/cordova-plugin-file-4.3.3.tgz",
@@ -711,6 +706,9 @@
             "resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-1.0.3.tgz",
             "integrity": "sha1-hJdpRRZ8CGySgTYtVg6x9xxjVFc="
         },
+        "EmailComposer": {
+            "version": "git+https://github.com/pliablepixels/email-composer.git#8ccfe440de9269946767a5260884869b72fb83f3"
+        },
         "ionic-plugin-keyboard": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/ionic-plugin-keyboard/-/ionic-plugin-keyboard-2.2.1.tgz",
diff --git a/package.json b/package.json
index 7430ba00..06322485 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,6 @@
                 "URL_SCHEME": "zmninja"
             },
             "cordova-plugin-device": {},
-            "cordova-plugin-email": {},
             "cordova-plugin-file": {},
             "cordova-plugin-file-transfer": {},
             "cordova-plugin-globalization": {},
@@ -51,10 +50,12 @@
             "phonegap-plugin-push": {
                 "SENDER_ID": "710936220256"
             },
-            "cordova-plugin-certificates": {}
+            "cordova-plugin-certificates": {},
+            "com.jcjee.plugins.emailcomposer": {}
         }
     },
     "dependencies": {
+        "EmailComposer": "git+https://github.com/pliablepixels/email-composer.git",
         "com.telerik.plugins.nativepagetransitions": "^0.6.5",
         "cordova-android": "^6.2.3",
         "cordova-ios": "^4.4.0",
@@ -67,7 +68,6 @@
         "cordova-plugin-console": "^1.0.7",
         "cordova-plugin-customurlscheme": "^4.3.0",
         "cordova-plugin-device": "^1.1.6",
-        "cordova-plugin-email": "^1.2.6",
         "cordova-plugin-file": "^4.3.3",
         "cordova-plugin-file-transfer": "^1.6.3",
         "cordova-plugin-globalization": "^1.0.7",
@@ -88,6 +88,7 @@
         "ionic-plugin-keyboard": "^2.2.1",
         "org.devgeeks.Canvas2ImagePlugin": "https://github.com/flache/Canvas2ImagePlugin",
         "phonegap-plugin-mobile-accessibility": "^1.0.5",
-        "phonegap-plugin-push": "^1.9.0"
+        "phonegap-plugin-push": "^1.9.0",
+        "com.jcjee.plugins.emailcomposer": "https://github.com/pliablepixels/email-composer"
     }
 }
\ No newline at end of file
diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js
index b7be82ba..af7b037e 100644
--- a/www/js/LogCtrl.js
+++ b/www/js/LogCtrl.js
@@ -155,34 +155,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
                 logstring = logstring.replace(re4, "<server>");
             }
 
-            cordova.plugins.email.isAvailable(
-                function (isAvailable) {
-
-                    if (isAvailable) {
-                        cordova.plugins.email.open({
-                         to: zm.authoremail,
-                         subject: $rootScope.appName + ' logs',
-                         body: logstring
-                         });
-                    }
-                    else {
-                        // kEmailNotConfigured
-                        $rootScope.zmPopup = SecuredPopups.show('alert',
-                        {
-                            title: $translate.instant('kError'),
-                            template: $translate.instant('kEmailNotConfigured'),
-                            okText: $translate.instant('kButtonOk'),
-                            cancelText: $translate.instant('kButtonCancel'),
-                        });
-
-                    }
-       
-            });
-
-
-            
-
-           // window.plugins.emailComposer.showEmailComposerWithCallback(callback, $rootScope.appName + ' logs', logstring, [zm.authoremail]);
+            window.plugins.emailComposer.showEmailComposerWithCallback(callback, $rootScope.appName + ' logs', logstring, [zm.authoremail]);
 
         }
         else