Updating commit before making changes

Just make sure everything is up to date

appinfo.json

@@ -19,29 +19,40 @@
     "projectType": "native",
     "resources": {
         "media": [
+            {
+                "file": "images/auth_icon.png",
+                "menuIcon": true,
+                "name": "IMAGE_ICON",
+                "type": "png"
+            },
             {
                 "characterRegex": "[0-9]",
+                "compatibility": "2.7",
                 "file": "fonts/BD_Cartoon_Shout.ttf",
                 "name": "FONT_BD_CARTOON_28",
                 "type": "font"
             },
             {
+                "compatibility": "2.7",
                 "file": "fonts/BD_Cartoon_Shout.ttf",
                 "name": "FONT_BD_CARTOON_20",
                 "type": "font"
             },
             {
                 "characterRegex": "[0-9]",
+                "compatibility": "2.7",
                 "file": "fonts/ANDROID_24.ttf",
                 "name": "FONT_DIGITAL_38",
                 "type": "font"
             },
             {
+                "compatibility": "2.7",
                 "file": "fonts/ANDROID_24.ttf",
                 "name": "FONT_DIGITAL_28",
                 "type": "font"
             },
             {
+                "compatibility": "2.7",
                 "file": "fonts/UNISPACE_20.ttf",
                 "name": "FONT_UNISPACE_20",
                 "type": "font"
@@ -57,27 +68,23 @@
                 "type": "png"
             },
             {
+                "compatibility": "2.7",
                 "file": "fonts/ORBITRON_28.ttf",
                 "name": "FONT_ORBITRON_28",
                 "type": "font"
             },
             {
+                "compatibility": "2.7",
                 "file": "fonts/BITWISE_32.ttf",
                 "name": "FONT_BITWISE_32",
                 "type": "font"
-            },
-            {
-                "file": "images/auth_icon.png",
-                "menuIcon": true,
-                "name": "IMAGE_ICON",
-                "type": "png"
             }
         ]
     },
     "shortName": "PebbleAuth",
     "uuid": "1f4d9835-3b9a-4ddd-907e-41a25d06f19c",
     "versionCode": 5,
-    "versionLabel": "1.4",
+    "versionLabel": "1.5",
     "watchapp": {
         "watchface": false
     }

src/js/pebble-js-app.js

@@ -10,7 +10,7 @@ var idle_timeout = 0;
 var message_send_retries = 0;
 var message_send_max_retries = 5;
 var app_version = 6;
-var debug = false;
+var debug = true;
 
 function loadLocalVariables() {
 
@@ -166,7 +166,7 @@ Pebble.addEventListener("webviewclosed",
 											console.log("INFO: Deleting key "+i);
 										localStorage.removeItem('secret_pair'+i);
 									}
-
+									otp_count = 0;
 									sendAppMessage(configuration);
 									return;
 								}
@@ -201,6 +201,7 @@ Pebble.addEventListener("webviewclosed",
 								config.idle_timeout = idle_timeout;
 
 								if(configuration.label && configuration.secret) {
+
 									var secret = configuration.secret
 										.replace(/0/g,"O")
 										.replace(/1/g, "I")

src/main.c

@@ -13,7 +13,7 @@
 #define MAX_LABEL_LENGTH 21 // 20 + termination
 #define MAX_KEY_LENGTH 65 // 64 + termination
 #define MAX_COMBINED_LENGTH MAX_LABEL_LENGTH+MAX_KEY_LENGTH
-#define DEBUG false
+#define DEBUG true
 
 // Main Window
 Window *main_window;
@@ -677,6 +677,7 @@ static void in_received_handler(DictionaryIterator *iter, void *context) {
 		}
 		otp_default = 0;
 		watch_otp_count = 0;
+		phone_otp_count = 0;
 		otp_selected = 0;
 		persist_write_int(PS_DEFAULT_KEY, otp_default);
 		refresh_screen_data(DOWN);