Merge pull request #26 from kontakt/master

Fix duplicate string termination
unlobito · Aug 23, 2016 · 159ff84 · 159ff84
2 parents 51cc2c2 + 54f39a2
commit 159ff84
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 76 deletions.
diff --git a/appinfo.json b/appinfo.json
diff --git a/package.json b/package.json
@@ -0,0 +1,56 @@
+{
+    "author": "Henri Watson",
+    "dependencies": {},
+    "keywords": [],
+    "name": "skunk",
+    "pebble": {
+        "capabilities": [
+            "configurable"
+        ],
+        "displayName": "Skunk",
+        "enableMultiJS": false,
+        "messageKeys": {
+            "card_barcode_data": 22,
+            "card_index": 20,
+            "card_name": 23,
+            "card_value": 21,
+            "error": 99,
+            "fetch_data": 0,
+            "number_of_cards": 10,
+            "pushing_data": 1,
+            "rewards_updated_at": 13
+        },
+        "projectType": "native",
+        "resources": {
+            "media": [
+                {
+                    "file": "images/refresh.png",
+                    "name": "IMAGE_REFRESH",
+                    "type": "bitmap"
+                },
+                {
+                    "file": "images/icon.png",
+                    "menuIcon": true,
+                    "name": "IMAGE_MENU_ICON",
+                    "type": "bitmap"
+                },
+                {
+                    "file": "images/error.png",
+                    "name": "IMAGE_ERROR",
+                    "type": "bitmap"
+                }
+            ]
+        },
+        "sdkVersion": "3",
+        "targetPlatforms": [
+            "aplite",
+            "basalt",
+            "chalk"
+        ],
+        "uuid": "1e420b43-63be-45f7-822c-2a7d57a55384",
+        "watchapp": {
+            "watchface": false
+        }
+    },
+    "version": "1.4.0"
+}
diff --git a/src/a2_strdup.c b/src/a2_strdup.c
@@ -4,7 +4,6 @@
 char *a2_strdup(const char *str) {
     size_t len = strlen(str) + 1;
     char *dup = malloc(len);
-    dup[len] = '\0';
     strcpy(dup, str);
     return dup;
 }
diff --git a/src/card_layer.c b/src/card_layer.c
@@ -45,7 +45,7 @@ CardLayer *card_layer_create(GRect frame) {
     layer_add_child(card_layer->layer, (Layer *)card_layer->name_text_layer);
 #ifdef PBL_ROUND
     // Note: The text_layer_enable_screen_text_flow_and_paging() function must be called after
-    // the TextLayer is added to the view heirachy (i.e.: after using layer_add_child()),
+    // the TextLayer is added to the view hierarchy (i.e.: after using layer_add_child()),
     // or else it will have no effect.
     text_layer_enable_screen_text_flow_and_paging(card_layer->name_text_layer, 2);
 #endif
@@ -232,7 +232,6 @@ bool card_layer_set_index(CardLayer *card_layer, uint8_t index) {
     layer_mark_dirty(card_layer->layer);
 
     // NAME
-
     if (card_layer->name_text) free(card_layer->name_text);
 
     const uint32_t name_key = STORAGE_CARD_VALUE(NAME, index);
@@ -248,17 +247,14 @@ bool card_layer_set_index(CardLayer *card_layer, uint8_t index) {
       layer_set_hidden((Layer *)card_layer->value_text_layer, false);
 
       if (card_layer->value_text) free(card_layer->value_text);
-
       const uint32_t value_key = STORAGE_CARD_VALUE(VALUE, index);
       char value_buffer[32];
       int value_bytes_read = persist_read_string(value_key, value_buffer, sizeof(value_buffer));
       value_buffer[MAX(0, value_bytes_read)] = '\0';
-
       card_layer->value_text = strdup(value_buffer);
       text_layer_set_text(card_layer->value_text_layer, card_layer->value_text);
     } else {
       layer_set_hidden((Layer *)card_layer->value_text_layer, true);
     }
-
     return true;
 }
diff --git a/src/js/pebble-js-app.js b/src/js/pebble-js-app.js
@@ -82,7 +82,7 @@ function base64_decode(data) {
 }
 
 Skunk.loadState = function() {
-  var state_json = window.localStorage.state;
+  var state_json = localStorage.state;
   if (!state_json) return false;
 
   Skunk.state = JSON.parse(state_json);
@@ -92,15 +92,16 @@ Skunk.loadState = function() {
 Skunk.saveState = function() {
   if (!Skunk.state) return false;
 
-  window.localStorage.state = JSON.stringify(Skunk.state);
+  localStorage.state = JSON.stringify(Skunk.state);
   return true;
 };
 
 Skunk.onShowConfiguration = function() {
-  if (!window.localStorage.config || window.localStorage.config == "") {
-    var url = Skunk.domain + '/settings';
+  var url;
+  if (!localStorage.config || localStorage.config === "") {
+    url = Skunk.domain + '/settings';
   } else {
-    var url = Skunk.domain + '/settings#' + base64_encode(window.localStorage.config);
+    url = Skunk.domain + '/settings#' + base64_encode(localStorage.config);
   }
   Pebble.openURL(url);
 };
@@ -109,7 +110,7 @@ Skunk.onWebViewClosed = function(event) {
   var response = event.response;
   if (!response || base64_decode(response).indexOf('{') === -1) return;
 
-  window.localStorage.config = base64_decode(response);
+  localStorage.config = base64_decode(response);
 
   Pebble.sendAppMessage({pushing_data: true});
 };
@@ -150,14 +151,12 @@ Skunk.sendData = function(callback) {
 
   var payloads = [];
 
-  {
-    var payload = { number_of_cards: cards.length };
-    payloads.push([payload, 'main']);
-  }
+  var payload = { number_of_cards: cards.length };
+  payloads.push([payload, 'main']);
 
   for (var i = 0; i < cards.length; i++) {
     var card = cards[i];
-    var payload = { card_index: i };
+    payload = { card_index: i };
     for (var key in card) {
       payload["card_" + key] = card[key];
     }
@@ -192,7 +191,7 @@ Skunk.sendError = function(message) {
 };
 
 Skunk.fetchData = function(callback) {
-  if (!window.localStorage.config || window.localStorage.config == "") {
+  if (!localStorage.config || localStorage.config === "") {
     console.log('[fetchData] No state.');
     Skunk.sendError('Please open Settings.');
     callback(false);
@@ -228,7 +227,7 @@ Skunk.fetchData = function(callback) {
   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
 
   console.log('[fetchData] Fetching data...');
-  xhr.send(window.localStorage.config);
+  xhr.send(localStorage.config);
 };
 
 Skunk.init = function() {

diff --git a/src/main.c b/src/main.c
@@ -215,7 +215,7 @@ static void app_message_read_first_payload(DictionaryIterator *dict) {
 static void app_message_read_card_payload(DictionaryIterator *dict, int32_t card_index) {
     Tuple *tuple = dict_read_first(dict);
     if (!tuple) {
-        APP_LOG(APP_LOG_LEVEL_ERROR, "[CARD %ld] dict_read_first -> NULL", card_index);
+        APP_LOG(APP_LOG_LEVEL_ERROR, "[CARD %ld] dict_read_first -> NULL", (long)card_index);
         return;
     }
 
@@ -265,7 +265,7 @@ static void app_message_inbox_received(DictionaryIterator *dict, void *context)
     Tuple *card_index_tpl = dict_find(dict, KEY_CARD_INDEX);
     if (card_index_tpl) {
         int32_t card_index = card_index_tpl->value->int32;
-        APP_LOG(APP_LOG_LEVEL_DEBUG, "%s <- CARD %ld", __PRETTY_FUNCTION__, card_index);
+        APP_LOG(APP_LOG_LEVEL_DEBUG, "%s <- CARD %ld", __PRETTY_FUNCTION__, (long)card_index);
         app_message_read_card_payload(dict, card_index);
     } else {
         APP_LOG(APP_LOG_LEVEL_DEBUG, "%s <- MAIN", __PRETTY_FUNCTION__);