{"commits":[{"author":{"email":"cf17b472504ed7b37aa65cac4259fd256182c091@gmail.com","name":"AndreasLarsson"},"sha":"a60115fba5f17e301b7fb36698acffcba62b9b79","message":"Merge branch 'Andreas'\n\nConflicts:\n\tsrc/tddd36/grupp3/controllers/ConnectionController.java","url":"https://api.github.com/repos/Projektgrupp3/projekt.mobile/commits/a60115fba5f17e301b7fb36698acffcba62b9b79"},{"author":{"email":"cf17b472504ed7b37aa65cac4259fd256182c091@gmail.com","name":"AndreasLarsson"},"sha":"f592daacb188b019b19ec7aa50de823f7b89d5b5","message":"Kontrollera gärna att dessa ändringar finns i koden:\n\nConnectionTask:\nSka finnas en if-sats med (messageFromServer.has(\"contacts\"))\n\nSender:\nMetoden sendContact(String contactName, String contactAddress) ska\nfinnas här.\n\nSIPView:\nI update-metoden ska det finnas följande rader:\ncontactList = new ArrayList<Contact>();\n\t\tcontactList = MainView.db.getAllRowsAsArrayList(\"contacts\");\n\t\tcontactNames = new String[contactList.size()];\n\t\tint index = 0;\n\t\tfor(Contact c : contactList){\n\t\t\tcontactNames[index] = c.getName()+ \" @ \"+ c.getSipaddress();\n\t\t\tindex++;\n\t\t}\n\nAddContactView:\nHär ska följande rad ligga i onClick-metoden (i en try-sats):\nSender.sendContact(newContact.getName(), newContact.getSipaddress());\n\nClientDatabaseManager:\nHär ska metoden checkRow(String str) finnas.\n\nMainView:\nFöljande rader ska ligga, nästan längst ner, i onCreate-metoden:\ntry {\n\tSender.send(\"getContacts\");\n\t} catch (JSONException e) {\n\t\t// TODO Auto-generated catch block\n\t\te.printStackTrace();\n}","url":"https://api.github.com/repos/Projektgrupp3/projekt.mobile/commits/f592daacb188b019b19ec7aa50de823f7b89d5b5"}],"ref":"refs/heads/master","head":"f592daacb188b019b19ec7aa50de823f7b89d5b5","size":2,"push_id":52017274}