Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1

src/de/tudarmstadt/informatik/hostage/logging/SyncRecord.java

@@ -123,7 +123,7 @@ public class SyncRecord implements Parcelable, Serializable {
     }
 
     public MessageRecord getMessageRecord(){
-        MessageRecord record = new MessageRecord();
+        MessageRecord record = new MessageRecord(true);
         record.setAttack_id(this.attack_id);
         record.setPacket(this.packet);
         record.setTimestamp(this.timestamp);

src/de/tudarmstadt/informatik/hostage/persistence/HostageDBOpenHelper.java

@@ -1246,11 +1246,12 @@ public class HostageDBOpenHelper extends SQLiteOpenHelper {
 		record.setWasInternalAttack(Integer.parseInt(cursor.getString(11)) == 1);
 
 		record.setBssid(cursor.getString(12));
-		record.setSsid(cursor.getString(13));
-		record.setLatitude(Double.parseDouble(cursor.getString(14)));
-		record.setLongitude(Double.parseDouble(cursor.getString(15)));
-		record.setAccuracy(Float.parseFloat(cursor.getString(16)));
-		record.setTimestampLocation(cursor.getLong(17));
+
+		record.setSsid(cursor.getString(15));
+		record.setLatitude(Double.parseDouble(cursor.getString(16)));
+		record.setLongitude(Double.parseDouble(cursor.getString(17)));
+		record.setAccuracy(Float.parseFloat(cursor.getString(18)));
+		record.setTimestampLocation(cursor.getLong(19));
 
 		return record;
 	}