gui for images

2 files changed, 21 insertions, 7 deletions

diff --git a/src/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/eu/siacs/conversations/persistance/DatabaseBackend.java
index 4c0d6216..852a9315 100644
--- a/src/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/src/eu/siacs/conversations/persistance/DatabaseBackend.java
@@ -23,7 +23,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 	private static DatabaseBackend instance = null;
 
 	private static final String DATABASE_NAME = "history";
-	private static final int DATABASE_VERSION = 2;
+	private static final int DATABASE_VERSION = 3;
 
 	public DatabaseBackend(Context context) {
 		super(context, DATABASE_NAME, null, DATABASE_VERSION);
@@ -50,7 +50,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 				+ " TEXT PRIMARY KEY, " + Message.CONVERSATION + " TEXT, "
 				+ Message.TIME_SENT + " NUMBER, " + Message.COUNTERPART
 				+ " TEXT, " + Message.BODY + " TEXT, " + Message.ENCRYPTION
-				+ " NUMBER, " + Message.STATUS + " NUMBER," + "FOREIGN KEY("
+				+ " NUMBER, " + Message.STATUS + " NUMBER," +Message.TYPE +" NUMBER, FOREIGN KEY("
 				+ Message.CONVERSATION + ") REFERENCES "
 				+ Conversation.TABLENAME + "(" + Conversation.UUID
 				+ ") ON DELETE CASCADE);");
@@ -72,6 +72,10 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 			db.execSQL("update " + Account.TABLENAME
 				+ " set " + Account.OPTIONS + " = " + Account.OPTIONS + " | 8");
 		}
+		if (oldVersion < 3 && newVersion >= 3) {
+			//add field type to message
+			db.execSQL("ALTER TABLE "+Message.TABLENAME+" ADD COLUMN "+Message.TYPE+" NUMBER");;
+		}
 	}
 
 	public static synchronized DatabaseBackend getInstance(Context context) {
diff --git a/src/eu/siacs/conversations/persistance/FileBackend.java b/src/eu/siacs/conversations/persistance/FileBackend.java
index 05c50530..9ae40645 100644
--- a/src/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/eu/siacs/conversations/persistance/FileBackend.java
@@ -15,6 +15,7 @@ import android.net.Uri;
 import android.util.Log;
 
 import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.Message;
 
 
 public class FileBackend {
@@ -27,14 +28,18 @@ public class FileBackend {
 		this.context = context;
 	}
 	
+	private File getImageFile(Message message) {
+		Conversation conversation = message.getConversation();
+		String prefix =  context.getFilesDir().getAbsolutePath();
+		String path = prefix+"/"+conversation.getAccount().getJid()+"/"+conversation.getContactJid();
+		String filename = message.getUuid() + ".webp";
+		return new File(path+"/"+filename);
+	}
 	
-	public File copyImageToPrivateStorage(Conversation conversation, Uri image) {
+	public File copyImageToPrivateStorage(Message message, Uri image) {
 		try {
 			InputStream is = context.getContentResolver().openInputStream(image);
-			String prefix =  context.getFilesDir().getAbsolutePath();
-			String path = prefix+"/"+conversation.getAccount().getJid()+"/"+conversation.getContactJid();
-			String filename =new BigInteger(""+System.currentTimeMillis()).toString(32) + ".webp";
-			File file = new File(path+"/"+filename);
+			File file = getImageFile(message);
 			file.getParentFile().mkdirs();
 			file.createNewFile();
 			OutputStream os = new FileOutputStream(file);
@@ -73,4 +78,9 @@ public class FileBackend {
 		
 		return null;
 	}
+	
+	
+	public Bitmap getImageFromMessage(Message message) {
+		return BitmapFactory.decodeFile(getImageFile(message).getAbsolutePath());
+	}
 }