1 files changed, 12 insertions, 11 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/persistance/MessageDatabaseAccess.java b/src/main/java/de/thedevstack/conversationsplus/persistance/MessageDatabaseAccess.java
index 7776174d..ba5f4a2c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/persistance/MessageDatabaseAccess.java
+++ b/src/main/java/de/thedevstack/conversationsplus/persistance/MessageDatabaseAccess.java
@@ -5,26 +5,27 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
 import de.thedevstack.android.logcat.Logging;
-import de.thedevstack.conversationsplus.entities.Message;
-import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
-import de.thedevstack.conversationsplus.xmpp.jid.Jid;
+
+import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.xmpp.jid.InvalidJidException;
+import eu.siacs.conversations.xmpp.jid.Jid;
 
 /**
  * Created by steckbrief on 15.04.2016.
  */
 public class MessageDatabaseAccess {
-    static final String TABLE_NAME_ADDITIONAL_PARAMETERS = "message_parameters";
-    static final String COLUMN_NAME_MSG_PARAMS_HTTPUPLOAD = "httpupload";
-    static final String COLUMN_NAME_MSG_PARAMS_MSGUUID = "message_uuid";
-    static final String COLUMN_NAME_MSG_PARAMS_TREATASDOWNLOADABLE_DECISION = "treatasdownloadable_decision";
+    public static final String TABLE_NAME_ADDITIONAL_PARAMETERS = "message_parameters";
+    public static final String COLUMN_NAME_MSG_PARAMS_HTTPUPLOAD = "httpupload";
+    public static final String COLUMN_NAME_MSG_PARAMS_MSGUUID = "message_uuid";
+    public static final String COLUMN_NAME_MSG_PARAMS_TREATASDOWNLOADABLE_DECISION = "treatasdownloadable_decision";
 
-    static final String TABLE_ADDITIONAL_PARAMETERS_CREATE_V0 = "CREATE TABLE " + MessageDatabaseAccess.TABLE_NAME_ADDITIONAL_PARAMETERS + " ("
+    public static final String TABLE_ADDITIONAL_PARAMETERS_CREATE_V0 = "CREATE TABLE " + MessageDatabaseAccess.TABLE_NAME_ADDITIONAL_PARAMETERS + " ("
             + MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_MSGUUID + " TEXT, "
             + MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_HTTPUPLOAD + " INTEGER DEFAULT 0, "
             + MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_TREATASDOWNLOADABLE_DECISION + " TEXT DEFAULT 'NOT_DECIDED', "
             + "FOREIGN KEY(" + MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_MSGUUID + ") REFERENCES " + Message.TABLENAME + "(" + Message.UUID + ") ON DELETE CASCADE)";
 
-    static ContentValues getAdditionalParametersContentValues(Message message) {
+    public static ContentValues getAdditionalParametersContentValues(Message message) {
         ContentValues additionalParameters = new ContentValues();
         additionalParameters.put(MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_MSGUUID, message.getUuid());
         additionalParameters.put(MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_HTTPUPLOAD, message.isHttpUploaded() ? 1 : 0);
@@ -33,7 +34,7 @@ public class MessageDatabaseAccess {
         return additionalParameters;
     }
 
-    static void populateMessageParametersFromCursor(Cursor cursor, Message message) {
+    public static void populateMessageParametersFromCursor(Cursor cursor, Message message) {
         boolean isHttpUploaded = CursorHelper.getInt(cursor, COLUMN_NAME_MSG_PARAMS_HTTPUPLOAD) == 1;
         message.setHttpUploaded(isHttpUploaded);
         String downloadable = CursorHelper.getString(cursor, COLUMN_NAME_MSG_PARAMS_TREATASDOWNLOADABLE_DECISION);
@@ -47,7 +48,7 @@ public class MessageDatabaseAccess {
         message.setTreatAsDownloadable(treatAsDownloadable);
     }
 
-    static void populateMessageParameters(SQLiteDatabase db, Message message) {
+    public static void populateMessageParameters(SQLiteDatabase db, Message message) {
         Cursor paramsCursor = db.query(MessageDatabaseAccess.TABLE_NAME_ADDITIONAL_PARAMETERS,
                 null, MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_MSGUUID + "=?",
                 new String[] {message.getUuid()},