code cleanup

app/App_Resources/Android/AndroidManifest.xml

@@ -18,7 +18,6 @@
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!--     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />     -->
     <uses-permission android:name="android.permission.VIBRATE" />
 
 	<application
@@ -46,15 +45,6 @@
             android:exported="false" />
 
         <receiver android:name="com.tns.broadcastreceivers.EventReceiver" />
-		<!--in case in the future we want to add functionality for resetting the alarm under some events, we can use another BroadcastReceiver
-        <receiver android:name="com.tns.broadcastreceivers.AlarmRestarter">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.TIMEZONE_CHANGED" />
-                <action android:name="android.intent.action.TIME_SET" />
-            </intent-filter>
-        </receiver>
-		-->
 
 	</application>
 </manifest>

app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -123,6 +123,6 @@
   ],
   "info" : {
     "version" : 1,
-    "author" : "xcode"
+    "author" : "Juan Lopez"
   }
 }

app/App_Resources/iOS/Assets.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
     "version" : 1,
-    "author" : "xcode"
+    "author" : "Juan Lopez"
   }
 }

app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json

@@ -153,6 +153,6 @@
   ],
   "info" : {
     "version" : 1,
-    "author" : "xcode"
+    "author" : "Juan Lopez"
   }
 }

app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json

@@ -17,6 +17,6 @@
   ],
   "info" : {
     "version" : 1,
-    "author" : "xcode"
+    "author" : "Juan Lopez"
   }
 }

app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json

@@ -17,6 +17,6 @@
   ],
   "info" : {
     "version" : 1,
-    "author" : "xcode"
+    "author" : "Juan Lopez"
   }
 }

app/alarm-setup.android.js

@@ -1,6 +1,7 @@
 var applicationSettings = require("application-settings");
 
 function setupAlarm(context) {
+
     var alarmIntent = getIntent(context);
     var alarmManager = context.getSystemService(android.content.Context.ALARM_SERVICE);
     alarmManager.setInexactRepeating(android.app.AlarmManager.RTC,

app/app.js

@@ -1,50 +1,21 @@
 var application = require("application");
 var applicationSettings = require("application-settings");
 
+
 function setRunning() {
     applicationSettings.setString("app.state", "running");
-    console.log("app state changed to Running");
 }
 
 function setStopped() {
     applicationSettings.setString("app.state", "stopped");
-    console.log("app state changed to Stopped");
-}
-
-application.on(application.launchEvent, setLaunch);
-application.on(application.resumeEvent, setResume);
-
-application.on(application.suspendEvent, setSuspend);
-application.on(application.exitEvent, setExit);
-application.on(application.uncaughtErrorEvent, setError);
-
-function setLaunch() {
-    applicationSettings.setString("app.state", "running");
-    applicationSettings.setBoolean("app.launched", true);
-    console.log("JUAN: LAUNCH EVENT");
-}
-
-function setResume() {
-    applicationSettings.setString("app.state", "running");
-    console.log("JUAN: RESUME EVENT");
-}
-
-function setSuspend() {
-    applicationSettings.setString("app.state", "stopped");
-    console.log("JUAN: SUSPEND EVENT");
 }
 
-function setExit() {
-    applicationSettings.setString("app.state", "stopped");
-    applicationSettings.setBoolean("app.launched", false);
-    console.log("JUAN: EXIT EVENT");
-}
+application.on(application.launchEvent, setRunning);
+application.on(application.resumeEvent, setRunning);
 
-function setError() {
-    applicationSettings.setString("app.state", "stopped");
-    applicationSettings.setBoolean("app.launched", false);
-    console.log("JUAN: ERROR EVENT");
-}
+application.on(application.suspendEvent, setStopped);
+application.on(application.exitEvent, setStopped);
+application.on(application.uncaughtErrorEvent, setStopped);
 
 
 

app/broadcastreceivers/EventReceiver.js → app/broadcastreceivers/EventReceiver.android.js

@@ -1,12 +1,11 @@
 android.content.BroadcastReceiver.extend("com.tns.broadcastreceivers.EventReceiver", {
     onReceive: function(context, intent) {
+
         var action = intent.getAction();
         var serviceIntent = null;
         if ("ACTION_START_NOTIFICATION_SERVICE" == action) {
-            console.log("onReceive from alarm, starting notification service! thread: " + java.lang.Thread.currentThread().getName());
             serviceIntent = createIntentStartNotificationService(context);
         } else if ("ACTION_DELETE_NOTIFICATION" == action) {
-            console.log("onReceive delete notification action, starting notification service to handle delete");
             serviceIntent = createIntentDeleteNotification(context);
         }
 

app/notifier.js

@@ -2,43 +2,6 @@ var LocalNotifications = require("nativescript-local-notifications");
 var applicationSettings = require("application-settings");
 
 
-/*
-function createNotification(title, text) {
-
-    if (applicationSettings.getBoolean("user.showNotifications", true))
-        return;
-
-    var context = utils.ad.getApplicationContext();
-
-    var builder = new android.app.Notification.Builder(context);
-    builder.setContentTitle(title)
-        .setAutoCancel(true)
-        .setContentText(text)
-        //.setVibrate([100, 200, 100])
-        .setSmallIcon(android.R.drawable.btn_star_big_on)
-        .setDefaults(android.app.Notification.DEFAULT_ALL); //  .setDefaults( DEFAULT_SOUND | DEFAULT_VIBRATE | DEFAULT_LIGHTS )
-
-    // will open main NativeScript activity when the notification is pressed
-    var mainIntent = new android.content.Intent(context, com.tns.NativeScriptActivity.class);
-    var pendingIntent = android.app.PendingIntent.getActivity(context,
-        1,
-        mainIntent,
-        android.app.PendingIntent.FLAG_UPDATE_CURRENT);
-    builder.setContentIntent(pendingIntent);
-    builder.setDeleteIntent(getDeleteIntent(context));
-
-    var manager = context.getSystemService(android.content.Context.NOTIFICATION_SERVICE);
-    manager.notify(1, builder.build());
-}
-
-function getDeleteIntent(context) {
-    var intent = new android.content.Intent(context, com.tns.broadcastreceivers.EventReceiver.class);
-    intent.setAction("ACTION_DELETE_NOTIFICATION");
-    return android.app.PendingIntent.getBroadcast(context, 0, intent, android.app.PendingIntent.FLAG_UPDATE_CURRENT);
-}
-*/
-
-
 function createNotification(title, text) {
 
     if (!applicationSettings.getBoolean("user.showNotifications", true))
@@ -47,12 +10,16 @@ function createNotification(title, text) {
     LocalNotifications.schedule([{
         title: title,
         body: text
-    }]).then(() => {
-        console.log("Notification scheduled");
-    }, (error) => {
-        console.log("ERROR", error);
+    }]).then((error) => {
+        console.error("Error creating notification: ", error);
     });
 }
 
 
-module.exports.createNotification = createNotification;
+function clearNotifications() {
+    LocalNotifications.cancelAll();
+}
+
+
+module.exports.createNotification = createNotification;
+module.exports.clearNotifications = clearNotifications;

app/services/BackgroundService.js → app/services/BackgroundService.android.js

@@ -18,28 +18,21 @@ com.pip3r4o.android.app.IntentService.extend("com.tns.notifications.BackgroundSe
 function doService() {
 
     var text;
-    console.log("Starting background service");
 
     //if user doesn't want notifications, there's no reason to fetch them
     if (!applicationSettings.getBoolean("user.showNotifications", true))
         return;
 
     //if app is running and on foreground, no need to do anything
-    if (applicationSettings.getString("app.state") == "running") {
-        console.log("Our app is on foreground, no need to do anything here");
+    if (applicationSettings.getString("app.state") == "running")
         return;
-    }
 
     var connectionType = connectivity.getConnectionType();
-    if (connectionType == connectivity.connectionType.none) {
-        console.log("No connectivity, nothing done in the service");
+    if (connectionType == connectivity.connectionType.none)
         return;
-    }
 
-    if (applicationSettings.getString("server.ip", "") === "" || applicationSettings.getString("user.password", "") === "" || applicationSettings.getString("user.name", "") === "") {
-        console.log("Not configured yet, exiting background service");
+    if (applicationSettings.getString("server.ip", "") === "" || applicationSettings.getString("user.password", "") === "" || applicationSettings.getString("user.name", "") === "")
         return;
-    }
 
     http.request({
         url: "http://" + applicationSettings.getString("server.ip") + ":" + applicationSettings.getString("server.port", "80") + "/sse/check",
@@ -48,10 +41,9 @@ function doService() {
         content: JSON.stringify({ user: "myUserId", pass: "myPassword" })
     }).then(function(response) {
         respObj = response.content.toJSON();
-        console.log("Got a result from the server: " + response.content);
         if (respObj.newNotifications > 0)
             notifier.createNotification("Notifier", "you've got " + respObj.newNotifications + " new notifications!");
     }, function(e) {
-        console.log("Error occurred while checking the server for updates: " + e);
+        console.error("Error occurred while checking the server for updates: " + e);
     });
 }

app/views/config/config.js

@@ -6,17 +6,11 @@ var Toast = require("nativescript-toast");
 var alarm = require("~/alarm-setup");
 
 
-var page;
 var configData;
 
 
-exports.onNavigatingTo = function() {
-    console.log("PAGE onNavigatingTo");
-};
-
-exports.onLoaded = (args) => {
-    console.log("PAGE onLoaded");
 
+exports.onNavigatingTo = (args) => {
     configData = new Observable();
     configData.userName = applicationSettings.getString("user.name", "");
     configData.password = applicationSettings.getString("user.password", "");
@@ -25,17 +19,21 @@ exports.onLoaded = (args) => {
     configData.port = applicationSettings.getString("server.port", "80");
     configData.frequency = applicationSettings.getString("server.frequency", "10");
 
-    page = args.object;
-    page.bindingContext = configData;
+    args.object.bindingContext = configData;
 }
 
-exports.save = function() {
 
-    if (configData.showNotifications && !applicationSettings.getBoolean("user.showNotifications", true))
+exports.save = function() {
+    if (configData.showNotifications && (!applicationSettings.getBoolean("user.showNotifications", true) || configData.frequency != applicationSettings.getString("server.frequency", "10")))
         alarm.setupAlarm(utils.ad.getApplicationContext());
     else if (!configData.showNotifications && applicationSettings.getBoolean("user.showNotifications", true))
         alarm.cancelAlarm(utils.ad.getApplicationContext());
 
+    if (applicationSettings.getString("server.ip", "") != configData.ip || applicationSettings.getString("server.port", "80") != configData.port ||
+        applicationSettings.getString("user.password", "") != configData.password || applicationSettings.getString("user.name", "") != configData.userName) {
+        applicationSettings.setBoolean("config.changed", true);
+    }
+
     applicationSettings.setString("user.name", configData.userName);
     applicationSettings.setString("user.password", configData.password);
     applicationSettings.setBoolean("user.showNotifications", configData.showNotifications);
@@ -47,6 +45,7 @@ exports.save = function() {
     frameModule.topmost().goBack();
 };
 
+
 exports.goBack = function() {
     frameModule.topmost().goBack();
 }

app/views/config/config.xml

@@ -1,4 +1,4 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd"  xmlns:myXml="common/xml" navigatingTo="onNavigatingTo" loaded="onLoaded">
+<Page xmlns="http://schemas.nativescript.org/tns.xsd"  xmlns:myXml="common/xml" navigatingTo="onNavigatingTo">
 
     <Page.actionBar>
         <ActionBar title="Configuration" style="padding-right:10">

app/views/main/main-page.css

@@ -5,7 +5,7 @@
     text-align: center;
     margin-top: 5px;
     margin-bottom: 1px;
-    padding: 10 0;
+    padding: 15 0;
     border-bottom-color: #DDD;
     border-bottom-width: 1;
 }
@@ -52,7 +52,7 @@ ActionBar {
 }
 
 .clearButton {
-    margin: 15px 1px;
+    margin: 20px 1px 15px 1px;
     font-size: 14;
     font-weight: bold;
     padding: 0 1;
@@ -70,11 +70,11 @@ ActionBar {
 .listEntry1 {
     /*border-bottom-width: 1;
     border-bottom-color: #EEE;*/
-    padding: 7 13;
+    padding: 10 13;
 }
 
 .listEntry2 {
-    padding: 7 13;
+    padding: 10 13;
     background-color: #FBFBFF
 }