| ... | ... |
@@ -50,17 +50,14 @@ static void prv_load_settings() {
|
| 50 | 50 |
// Read settings from persistent storage, if they exist |
| 51 | 51 |
persist_read_data(SETTINGS_KEY, &settings, sizeof(settings)); |
| 52 | 52 |
APP_LOG(APP_LOG_LEVEL_DEBUG, "user in settings... %s",settings.username); |
| 53 |
- APP_LOG(APP_LOG_LEVEL_DEBUG, "user in password... %s",settings.password); |
|
| 54 |
- APP_LOG(APP_LOG_LEVEL_DEBUG, "user in server... %s",settings.server); |
|
| 53 |
+ APP_LOG(APP_LOG_LEVEL_DEBUG, "password in settings... %s",settings.password); |
|
| 54 |
+ APP_LOG(APP_LOG_LEVEL_DEBUG, "server in settings... %s",settings.server); |
|
| 55 | 55 |
} |
| 56 | 56 |
|
| 57 | 57 |
// Save the settings to persistent storage |
| 58 | 58 |
static void prv_save_settings() {
|
| 59 | 59 |
persist_write_data(SETTINGS_KEY, &settings, sizeof(settings)); |
| 60 | 60 |
persist_read_data(SETTINGS_KEY, &settings, sizeof(settings)); |
| 61 |
- APP_LOG(APP_LOG_LEVEL_DEBUG, "user in settings... %s",settings.username); |
|
| 62 |
- APP_LOG(APP_LOG_LEVEL_DEBUG, "user in password... %s",settings.password); |
|
| 63 |
- APP_LOG(APP_LOG_LEVEL_DEBUG, "user in server... %s",settings.server); |
|
| 64 | 61 |
} |
| 65 | 62 |
|
| 66 | 63 |
//! helper to construct the various text layers as they appear in this app |
| ... | ... |
@@ -291,23 +288,23 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {
|
| 291 | 288 |
// Read String preferences |
| 292 | 289 |
Tuple *username_t = dict_find(iter, MESSAGE_KEY_username); |
| 293 | 290 |
if(username_t) {
|
| 294 |
- strncpy(s_username, username_t->value->cstring, 40); |
|
| 291 |
+ strncpy(settings.username, username_t->value->cstring, 40); |
|
| 295 | 292 |
prv_save_settings(); |
| 296 |
- APP_LOG(APP_LOG_LEVEL_DEBUG, "new username in settings... %s",s_username); |
|
| 293 |
+ APP_LOG(APP_LOG_LEVEL_DEBUG, "new username in settings... %s",settings.username); |
|
| 297 | 294 |
} |
| 298 | 295 |
|
| 299 | 296 |
Tuple *password_t = dict_find(iter, MESSAGE_KEY_password); |
| 300 | 297 |
if(password_t) {
|
| 301 |
- strncpy(s_password, password_t->value->cstring, 40); |
|
| 298 |
+ strncpy(settings.password, password_t->value->cstring, 40); |
|
| 302 | 299 |
prv_save_settings(); |
| 303 |
- APP_LOG(APP_LOG_LEVEL_DEBUG, "new password in settings... %s",s_password); |
|
| 300 |
+ APP_LOG(APP_LOG_LEVEL_DEBUG, "new password in settings... %s",settings.password); |
|
| 304 | 301 |
} |
| 305 | 302 |
|
| 306 | 303 |
Tuple *server_t = dict_find(iter, MESSAGE_KEY_server); |
| 307 | 304 |
if(server_t) {
|
| 308 |
- strncpy(s_server, server_t->value->cstring, 99); |
|
| 305 |
+ strncpy(settings.server, server_t->value->cstring, 99); |
|
| 309 | 306 |
prv_save_settings(); |
| 310 |
- APP_LOG(APP_LOG_LEVEL_DEBUG, "new server in settings... %s",s_server); |
|
| 307 |
+ APP_LOG(APP_LOG_LEVEL_DEBUG, "new server in settings... %s",settings.server); |
|
| 311 | 308 |
} |
| 312 | 309 |
|
| 313 | 310 |
} |
| ... | ... |
@@ -6,9 +6,9 @@ |
| 6 | 6 |
|
| 7 | 7 |
// Define our settings struct |
| 8 | 8 |
typedef struct ClaySettings {
|
| 9 |
- char * username; |
|
| 10 |
- char * password; |
|
| 11 |
- char * server; |
|
| 9 |
+ char s_username[40]; |
|
| 10 |
+ char s_password[40]; |
|
| 11 |
+ char s_server[100]; |
|
| 12 | 12 |
} __attribute__((__packed__)) ClaySettings; |
| 13 | 13 |
|
| 14 | 14 |
//Define our Appkey enums |