🎛️ ControlHelper Rewrite

www/js/control/DataDatePicker.tsx

@@ -4,12 +4,10 @@
 import React from "react";
 import { DatePickerModal } from 'react-native-paper-dates';
 import { useTranslation } from "react-i18next";
-import { getAngularService } from "../angular-react-helper";
+import { getMyData } from "../controlHelper";
 
 const DataDatePicker = ({date, setDate, open, setOpen, minDate}) => {
   const { t, i18n } = useTranslation(); //able to pull lang from this
-  const ControlHelper = getAngularService("ControlHelper");
-
   const onDismiss = React.useCallback(() => {
     setOpen(false);
   }, [setOpen]);
@@ -18,7 +16,7 @@ const DataDatePicker = ({date, setDate, open, setOpen, minDate}) => {
     (params) => {
       setOpen(false);
       setDate(params.date);
-      ControlHelper.getMyData(params.date);
+      getMyData(params.date);
     },
     [setOpen, setDate]
   );

www/js/control/ProfileSettings.jsx

@@ -24,6 +24,7 @@ import { AppContext } from "../App";
 import { shareQR } from "../components/QrCode";
 import { storageClear } from "../plugin/storage";
 import { getAppVersion } from "../plugin/clientStats";
+import { fetchOPCode, getSettings } from "../controlHelper";
 
 //any pure functions can go outside
 const ProfileSettings = () => {
@@ -38,7 +39,6 @@ const ProfileSettings = () => {
     const UploadHelper = getAngularService('UploadHelper');
     const EmailHelper = getAngularService('EmailHelper');
     const NotificationScheduler = getAngularService('NotificationScheduler');
-    const ControlHelper = getAngularService('ControlHelper');
     const StartPrefs = getAngularService('StartPrefs');
 
     //functions that come directly from an Angular service
@@ -196,7 +196,7 @@ const ProfileSettings = () => {
     }, [editSync]);
 
     async function getConnectURL() {
-        ControlHelper.getSettings().then(function(response) {
+        getSettings().then(function(response) {
             var newConnectSettings ={}
             newConnectSettings.url = response.connectUrl;
             console.log(response);
@@ -208,7 +208,7 @@ const ProfileSettings = () => {
 
     async function getOPCode() {
         const newAuthSettings = {};
-        const opcode = await ControlHelper.getOPCode();
+        const opcode = await fetchOPCode();
         if(opcode == null){
             newAuthSettings.opcode = "Not logged in";
         } else {

www/js/controlHelper.ts

@@ -0,0 +1,128 @@
+import { DateTime } from "luxon";
+
+import { getRawEntries } from "./commHelper";
+import { logInfo, displayError } from "./plugin/logger";
+import i18next from "./i18nextInit" ;
+
+interface fsWindow extends Window {
+  requestFileSystem: (
+    type: number,
+    size: number,
+    successCallback: (fs: any) => void,
+    errorCallback?: (error: any) => void
+  ) => void;
+  LocalFileSystem: {
+    TEMPORARY: number;
+    PERSISTENT: number;
+  };
+};
+
+declare let window: fsWindow;
+
+export const getMyData = function(startTs: Date) {
+    // We are only retrieving data for a single day to avoid
+    // running out of memory on the phone
+    const startTime = DateTime.fromJSDate(startTs);
+    const endTime = startTime.endOf("day");
+    const startTimeString = startTime.toFormat("yyyy'-'MM'-'dd");
+    const endTimeString = endTime.toFormat("yyyy'-'MM'-'dd");
+
+    const dumpFile = startTimeString + "."
+      + endTimeString
+      + ".timeline";
+      alert(`Going to retrieve data to ${dumpFile}`);
+
+    const writeDumpFile = function(result) {
+      const resultList = result.phone_data;
+      return new Promise<void>(function(resolve, reject) {
+        window.requestFileSystem(window.LocalFileSystem.TEMPORARY, 0, function(fs) {
+          console.log(`file system open: ${fs.name}`);
+          fs.root.getFile(dumpFile, { create: true, exclusive: false }, function (fileEntry) {
+            console.log(`fileEntry ${fileEntry.nativeURL} is file? ${fileEntry.isFile.toString()}`)
+            fileEntry.createWriter(function (fileWriter) {
+              fileWriter.onwriteend = function() {
+                console.log("Successful file write...");
+                resolve();
+              }
+              fileWriter.onerror = function(e) {
+                console.log(`Failed file write: ${e.toString()}`);
+                reject();
+              }
+
+              // if data object is not passed in, create a new blog instead.
+              const dataObj = new Blob([JSON.stringify(resultList, null, 2)],
+                { type: "application/json" });
+              fileWriter.write(dataObj);
+            })
+
+          });
+        });
+      });
+    }
+
+    const emailData = function() {
+      return new Promise<void>(function(resolve, reject) {
+      window.requestFileSystem(window.LocalFileSystem.TEMPORARY, 0, function(fs) {
+        console.log("During email, file system open: " + fs.name);
+        fs.root.getFile(dumpFile, null, function(fileEntry) {
+          console.log(`fileEntry ${fileEntry.nativeURL} is file? ${fileEntry.isFile.toString()}`);
+          fileEntry.file(function(file) {
+            const reader = new FileReader();
+
+            reader.onloadend = function() {
+              const readResult = this.result as string;
+              console.log(`Successfull file read with ${readResult.length} characters`);
+              const dataArray = JSON.parse(readResult);
+              console.log(`Successfully read resultList of size ${dataArray.length}`);
+              var attachFile = fileEntry.nativeURL;
+                if (window['device'].platform === "android")
+                  attachFile = "app://cache/" + dumpFile;
+                if (window['device'].platform === "ios")
+                  alert(i18next.t("email-service.email-account-mail-app"));
+                const email = {
+                  'files': [attachFile],
+                  'message': i18next.t("email-service.email-data.body-data-consists-of-list-of-entries"),
+                  'subject': i18next.t("email-service.email-data.subject-data-dump-from-to", {start: startTimeString ,end: endTimeString}),
+                }
+                window['plugins'].socialsharing.shareWithOptions(email, function (result) {
+                  console.log(`Share Completed? ${result.completed}`); // On Android, most likely returns false
+                  console.log(`Shared to app:  ${result.app}`);
+                  resolve();
+                }, function (msg) {
+                  console.log(`Sharing failed with message ${msg}`);
+                });
+            }
+            reader.readAsText(file);
+          }, function(error) {
+            displayError(error, "Error while downloading JSON dump");
+            reject(error);
+          })                        
+        });
+      });
+      });
+    };
+
+    // Simulate old conversion to get correct UnixInteger for endMoment data
+    const getUnixNum = (dateData: DateTime) => {
+      const tempDate = dateData.toFormat("dd MMM yyyy");
+      return DateTime.fromFormat(tempDate, "dd MMM yyyy").toUnixInteger();
+    };
+
+    getRawEntries(null, getUnixNum(startTime), startTime.toUnixInteger())
+      .then(writeDumpFile)
+      .then(emailData)
+      .then(function() {
+          logInfo("Email queued successfully");
+      })
+      .catch(function(error) {
+          displayError(error, "Error emailing JSON dump");
+      })
+};
+
+export const fetchOPCode = (() => {
+      return window["cordova"].plugins.OPCodeAuth.getOPCode();
+    });
+
+export const getSettings = (() => {
+      return window["cordova"].plugins.BEMConnectionSettings.getSettings();
+});

www/js/services.js

@@ -2,7 +2,7 @@
 
 import angular from 'angular';
 import { getRawEntries } from './commHelper';
-
+import { logInfo} from './plugin/logger'
 angular.module('emission.services', ['emission.plugin.logger'])
 
 .service('ReferHelper', function($http) {
@@ -22,7 +22,7 @@ angular.module('emission.services', ['emission.plugin.logger'])
     //}*/
     }
 })
-.service('UnifiedDataLoader', function($window, Logger) {
+.service('UnifiedDataLoader', function($window) {
     var combineWithDedup = function(list1, list2) {
       var combinedList = list1.concat(list2);
       return combinedList.filter(function(value, i, array) {
@@ -51,10 +51,10 @@ angular.module('emission.services', ['emission.plugin.logger'])
               if (localError && remoteError) {
                 reject([localError, remoteError]);
               } else {
-                Logger.log("About to dedup localResult = "+localResult.length
+                logInfo("About to dedup localResult = "+localResult.length
                     +"remoteResult = "+remoteResult.length);
                 var dedupedList = combiner(localResult, remoteResult);
-                Logger.log("Deduped list = "+dedupedList.length);
+                logInfo("Deduped list = "+dedupedList.length);
                 resolve(dedupedList);
               }
             }
@@ -102,121 +102,6 @@ angular.module('emission.services', ['emission.plugin.logger'])
       return combinedPromise(localPromise, remotePromise, combineWithDedup);
     }
 })
-.service('ControlHelper', function($window,
-                                   $ionicPopup,
-                                   Logger) {
-
-    this.writeFile = function(fileEntry, resultList) {
-      // Create a FileWriter object for our FileEntry (log.txt).
-    }
-
-    this.getMyData = function(startTs) {
-        var fmt = "YYYY-MM-DD";
-        // We are only retrieving data for a single day to avoid
-        // running out of memory on the phone
-        var startMoment = moment(startTs);
-        var endMoment = moment(startTs).endOf("day");
-        var dumpFile = startMoment.format(fmt) + "."
-          + endMoment.format(fmt)
-          + ".timeline";
-          alert("Going to retrieve data to "+dumpFile);
-
-          var writeDumpFile = function(result) {
-            return new Promise(function(resolve, reject) {
-              var resultList = result.phone_data;
-              window.requestFileSystem(window.LocalFileSystem.TEMPORARY, 0, function(fs) {
-                console.log('file system open: ' + fs.name);
-                fs.root.getFile(dumpFile, { create: true, exclusive: false }, function (fileEntry) {
-                  console.log("fileEntry "+fileEntry.nativeURL+" is file?" + fileEntry.isFile.toString());
-                  fileEntry.createWriter(function (fileWriter) {
-                    fileWriter.onwriteend = function() {
-                      console.log("Successful file write...");
-                      resolve();
-                      // readFile(fileEntry);
-                    };
-
-                    fileWriter.onerror = function (e) {
-                      console.log("Failed file write: " + e.toString());
-                      reject();
-                    };
-
-                    // If data object is not passed in,
-                    // create a new Blob instead.
-                    var dataObj = new Blob([JSON.stringify(resultList, null, 2)],
-                    { type: 'application/json' });
-                    fileWriter.write(dataObj);
-                  });
-                  // this.writeFile(fileEntry, resultList);
-                });
-              });
-            });
-          }
-
-
-          var emailData = function(result) {
-            return new Promise(function(resolve, reject) {
-              window.requestFileSystem(window.LocalFileSystem.TEMPORARY, 0, function(fs) {
-                console.log("During email, file system open: "+fs.name);
-                fs.root.getFile(dumpFile, null, function(fileEntry) {
-                  console.log("fileEntry "+fileEntry.nativeURL+" is file?"+fileEntry.isFile.toString());
-                  fileEntry.file(function (file) {
-                    var reader = new FileReader();
-
-                    reader.onloadend = function() {
-                      console.log("Successful file read with " + this.result.length +" characters");
-                      var dataArray = JSON.parse(this.result);
-                      console.log("Successfully read resultList of size "+dataArray.length);
-                      // displayFileData(fileEntry.fullPath + ": " + this.result);
-                      var attachFile = fileEntry.nativeURL;
-                      if (ionic.Platform.isAndroid()) {
-                        // At least on nexus, getting a temporary file puts it into
-                        // the cache, so I can hardcode that for now
-                        attachFile = "app://cache/"+dumpFile;
-                      }
-                      if (ionic.Platform.isIOS()) {
-                        alert(i18next.t('email-service.email-account-mail-app'));
-                      }
-                      var email = {
-                        attachments: [
-                          attachFile
-                        ],
-                        subject: i18next.t('email-service.email-data.subject-data-dump-from-to', {start: startMoment.format(fmt),end: endMoment.format(fmt)}),
-                        body: i18next.t('email-service.email-data.body-data-consists-of-list-of-entries')
-                      }
-                      $window.cordova.plugins.email.open(email).then(resolve());
-                    }
-                    reader.readAsText(file);
-                  }, function(error) {
-                    $ionicPopup.alert({title: "Error while downloading JSON dump",
-                      template: error});
-                    reject(error);
-                  });
-                });
-              });
-            });
-          };
-
-        getRawEntries(null, startMoment.unix(), endMoment.unix())
-          .then(writeDumpFile)
-          .then(emailData)
-          .then(function() {
-             Logger.log("Email queued successfully");
-          })
-          .catch(function(error) {
-             Logger.displayError("Error emailing JSON dump", error);
-          })
-    };
-
-    this.getOPCode = function() {
-      return window.cordova.plugins.OPCodeAuth.getOPCode();
-    };
-
-    this.getSettings = function() {
-      return window.cordova.plugins.BEMConnectionSettings.getSettings();
-    };
-
-})
-
 .factory('Chats', function() {
   // Might use a resource here that returns a JSON array