4 files changed, 56 insertions, 45 deletions

diff --git a/testing/nTox.c b/testing/nTox.c
index 24d40ead..13db58d7 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
 #include "nTox.h"
 #include "misc_tools.h"
@@ -54,7 +54,7 @@ void get_id(char *data)
     {
         if (self_public_key[i] < (PUB_KEY_BYTES / 2))
             strcpy(idstring1[i],"0");
-        else 
+        else
             strcpy(idstring1[i], "");
         sprintf(idstring2[i], "%hhX",self_public_key[i]);
     }
@@ -71,9 +71,9 @@ void get_id(char *data)
 void new_lines(char *line)
 {
     int i = 0;
-    for (i = HISTORY-1; i > 0; i--) 
+    for (i = HISTORY-1; i > 0; i--)
         strncpy(lines[i], lines[i-1], STRING_LENGTH - 1);
-    
+
     strncpy(lines[0], line, STRING_LENGTH - 1);
     do_refresh();
 }
@@ -133,7 +133,7 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
         if (inpt_command == 'f') { // add friend command: /f ID
             int i;
             char temp_id[128];
-            for (i = 0; i < 128; i++) 
+            for (i = 0; i < 128; i++)
                 temp_id[i] = line[i+prompt_offset];
 
             int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
@@ -166,8 +166,8 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
         }
         else if (inpt_command == 'm') { //message command: /m friendnumber messsage
             size_t len = strlen(line);
-            if(len < 3)
-              return;
+            if(len < 3)
+                return;
 
             char numstring[len-3];
             char message[len-3];
@@ -248,7 +248,7 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
         else if (inpt_command == 'q') { //exit
             endwin();
             exit(EXIT_SUCCESS);
-        } else { 
+        } else {
             new_lines("[i] invalid command");
         }
     } else {
@@ -335,7 +335,7 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length)
     new_lines(format_message((char*)string, friendnumber));
 }
 
-void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) 
+void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
 {
     char name[MAX_NAME_LENGTH];
     getname(friendnumber, (uint8_t*)name);
@@ -344,7 +344,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
     new_lines(msg);
 }
 
-void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) 
+void print_statuschange(int friendnumber, uint8_t *string, uint16_t length)
 {
     char name[MAX_NAME_LENGTH];
     getname(friendnumber, (uint8_t*)name);
@@ -353,7 +353,7 @@ void print_statuschange(int friendnumber, uint8_t *string, uint16_t length)
     new_lines(msg);
 }
 
-void load_key() 
+void load_key()
 {
     FILE *data_file = NULL;
     data_file = fopen("data","r");
@@ -368,7 +368,7 @@ void load_key()
             exit(1);
         }
         Messenger_load(data, size);
-    } else { 
+    } else {
         //else save new keys
         int size = Messenger_size();
         uint8_t data[size];
@@ -418,9 +418,9 @@ int main(int argc, char *argv[])
     int resolved_address = resolve_addr(argv[1]);
     if (resolved_address != 0)
         bootstrap_ip_port.ip.i = resolved_address;
-    else 
+    else
         exit(1);
-    
+
     DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
     nodelay(stdscr, TRUE);
     while(true) {
@@ -441,7 +441,7 @@ int main(int argc, char *argv[])
         if (c == '\n') {
             line_eval(lines, line);
             strcpy(line, "");
-        } else if (c == 127) {
+        } else if (c == 8 || c == 127) {
             line[strlen(line)-1] = '\0';
         } else if (isalnum(c) || ispunct(c) || c == ' ') {
             strcpy(line, appender(line, (char) c));
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c
index 3b6fb043..5501ecf5 100644
--- a/testing/nTox_win32.c
+++ b/testing/nTox_win32.c
@@ -32,6 +32,7 @@ uint32_t maxnumfriends;
 
 char line[STRING_LENGTH];
 char users_id[200];
+int friend_request_received;
 
 void do_header()
 {
@@ -44,10 +45,11 @@ void do_header()
 
 void print_request(uint8_t *public_key, uint8_t *data, uint16_t length)
 {
+    friend_request_received = 1;
     printf("\n\n[i] received friend request with message\n");
-    printf((char *)data);
+    printf("'%s'",(char *)data);
     char numchar[100];
-    sprintf(numchar, "\n\n[i] accept request with /a %u\n\n", num_requests);
+    sprintf(numchar, "\n[i] accept request with /a %u\n\n", num_requests);
     printf(numchar);
     memcpy(pending_requests[num_requests], public_key, CLIENT_ID_SIZE);
     ++num_requests;
@@ -151,23 +153,32 @@ void add_friend()
 
 void list_friends()
 {
-    int activefriends = 0;
     int i;
+    
+    printf("\n[i] Friend List");
+
+    printf("----- PENDING -----\n\n");
 
     for (i = 0; i <= maxnumfriends; i++) {
-        if (m_friendstatus(i) == 4)
-            activefriends++;
+        char name[MAX_NAME_LENGTH];
+        getname(i, (uint8_t*)name);
+        if (m_friendstatus(i) > 0 && m_friendstatus(i) < 4)
+            printf("[%d] %s\n", i, (uint8_t*)name);
     }
+    
+    printf("\n");
 
-    printf("\n[i] Friend List | Total: %d\n\n", activefriends);
+    printf("----- ACTIVE -----\n\n");
 
-    for (i = 0; i <= 256; i++) {/* TODO: fix this properly*/
+    for (i = 0; i <= maxnumfriends; i++) {
         char name[MAX_NAME_LENGTH];
         getname(i, (uint8_t*)name);
         
         if (m_friendstatus(i) == 4)    
-            printf("[%d] %s\n\n", i, (uint8_t*)name);
+            printf("[%d] %s\n", i, (uint8_t*)name);
     }
+
+    printf("\n");
 }
 
 void delete_friend()
@@ -244,7 +255,7 @@ void change_nickname()
     fclose(name_file);
 }
 
-void change_status()
+void change_status(int savetofile)
 {
     uint8_t status[MAX_USERSTATUS_LENGTH];
     int i = 0;
@@ -263,20 +274,21 @@ void change_status()
     sprintf(numstring, "\n[i] changed status to %s\n\n", (char*)status);
     printf(numstring);
 
-    FILE* status_file = NULL;
-    status_file = fopen("statusfile.txt", "w");
-    fprintf(status_file, "%s", (char*)status);
-    fclose(status_file);
+    if (savetofile == 1) {
+        FILE* status_file = NULL;
+        status_file = fopen("statusfile.txt", "w");
+        fprintf(status_file, "%s", (char*)status);
+        fclose(status_file);
+    }
 }
 
 void accept_friend_request()
 {
+    friend_request_received = 0;
     uint8_t numf = atoi(line + 3);
     char numchar[100];
-    sprintf(numchar, "\n[i] friend request %u accepted\n\n", numf);
-    printf(numchar);
     int num = m_addfriend_norequest(pending_requests[numf]);
-    sprintf(numchar, "\n[i] added friendnumber %d\n\n", num);
+    sprintf(numchar, "\n[i] Added friendnumber: %d\n\n", num);
     printf(numchar);
     ++maxnumfriends;
 }
@@ -288,7 +300,7 @@ void line_eval(char* line)
         char inpt_command = line[1];
 
         if(inpt_command == 'f') {
-            add_friend(line);
+            add_friend();
         }
 
         else if (inpt_command == 'r') {
@@ -297,32 +309,33 @@ void line_eval(char* line)
         }
 
         else if (inpt_command == 'l') {
-            list_friends(line);
+            list_friends();
         }
 
         else if (inpt_command == 'd') {
-            delete_friend(line);
+            delete_friend();
         }
         /* Send message to friend */
         else if (inpt_command == 'm') {
-            message_friend(line);
+            message_friend();
         }
 
         else if (inpt_command == 'n') {
-            change_nickname(line);
+            change_nickname();
         }
 
         else if (inpt_command == 's') {
-            change_status(line);
+            change_status(1);
         }
 
         else if (inpt_command == 'a') {
-            accept_friend_request(line);
+            if (friend_request_received == 1)
+                accept_friend_request(line);
         }
         /* EXIT */
         else if (inpt_command == 'q') { 
-            uint8_t status[MAX_USERSTATUS_LENGTH] = "Offline";
-            m_set_userstatus(status, strlen((char*)status));
+            strcpy(line, "---Offline");
+            change_status(0);
             exit(EXIT_SUCCESS);
         }
     }
@@ -368,8 +381,7 @@ int main(int argc, char *argv[])
         nameloaded = 1;
         printf("%s\n", name);
         fclose(name_file);
-    }
-    
+    } 
 
     FILE* status_file = NULL;
     status_file = fopen("statusfile.txt", "r");
@@ -383,7 +395,6 @@ int main(int argc, char *argv[])
         printf("%s\n", status);
         fclose(status_file);
     }
-    
 
     m_callback_friendrequest(print_request);
     m_callback_friendmessage(print_message);
diff --git a/testing/nTox_win32.h b/testing/nTox_win32.h
index 211ac95f..271403b8 100644
--- a/testing/nTox_win32.h
+++ b/testing/nTox_win32.h
@@ -39,7 +39,7 @@ void list_friends();
 void delete_friend();
 void message_friend();
 void change_nickname();
-void change_status();
+void change_status(int savetofile);
 void accept_friend_request();
 void line_eval(char* line);
 void get_input();
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index bcfc487f..391b0b39 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -50,7 +50,7 @@ void on_request(uint8_t* public_key, uint8_t* data, uint16_t length) {
 void on_message(int friendnumber, uint8_t* string, uint16_t length) {
   size_t i;
 
-  wprintw(prompt->window, "\n(message) %d: %s!\n", friendnumber, string);
+  wprintw(prompt->window, "\n(message) %d: %s\n", friendnumber, string);
 
   for(i=0; i<w_num; i++) {
     if(windows[i].onMessage != NULL)