From 5babc3d512d378bf83cfd57d2673d8d3246c7510 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sun, 2 Oct 2016 13:21:42 +0200 Subject: [PATCH] Prepare for BLOB-handling. --- TMessagesProj/jni/mr_wrapper.c | 6 ++++-- .../main/java/org/telegram/messenger/ApplicationLoader.java | 2 +- .../src/main/java/org/telegram/messenger/MrMailbox.java | 2 +- .../src/main/java/org/telegram/ui/ChatActivity.java | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/TMessagesProj/jni/mr_wrapper.c b/TMessagesProj/jni/mr_wrapper.c index 15acc6ddd..15ea3a5f3 100644 --- a/TMessagesProj/jni/mr_wrapper.c +++ b/TMessagesProj/jni/mr_wrapper.c @@ -57,10 +57,12 @@ JNIEXPORT jlong Java_org_telegram_messenger_MrMailbox_MrMailboxNew(JNIEnv *env, /* MrMailbox - open/close/connect/fetch */ -JNIEXPORT jint Java_org_telegram_messenger_MrMailbox_MrMailboxOpen(JNIEnv *env, jclass c, jlong hMailbox, jstring dbfile) +JNIEXPORT jint Java_org_telegram_messenger_MrMailbox_MrMailboxOpen(JNIEnv *env, jclass c, jlong hMailbox, jstring dbfile, jstring blobdir) { CHAR_REF(dbfile); - jint ret = mrmailbox_open((mrmailbox_t*)hMailbox, dbfilePtr); + CHAR_REF(blobdir); + jint ret = mrmailbox_open((mrmailbox_t*)hMailbox, dbfilePtr, blobdirPtr); + CHAR_UNREF(blobdir); CHAR_UNREF(dbfile) return ret; } diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java b/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java index ab8dfa6b1..eb40c32c9 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java @@ -281,7 +281,7 @@ public class ApplicationLoader extends Application { // EDIT BY MR - open my sqlite file (you can inspect the file eg. with "Tools / Android Device Monitor / File Explorer") File dbfile = new File(getFilesDirFixed(), "messenger.db"); - MrMailbox.MrMailboxOpen(MrMailbox.hMailbox, dbfile.getAbsolutePath()); + MrMailbox.MrMailboxOpen(MrMailbox.hMailbox, dbfile.getAbsolutePath(), ""); } @Override diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java index 57029b033..3f294cc20 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java @@ -57,7 +57,7 @@ public class MrMailbox { // MrMailbox objects public native static long MrMailboxNew (); // returns hMailbox which must be unref'd after usage (Names as mrmailbox_new don't work due to the additional underscore) - public native static int MrMailboxOpen (long hMailbox, String dbfile); + public native static int MrMailboxOpen (long hMailbox, String dbfile, String blobdir); public native static void MrMailboxClose (long hMailbox); public native static int MrMailboxConnect (long hMailbox); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index a6bf73e3f..f16601227 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -980,7 +980,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not if (currentEncryptedChat != null) { timeItem2 = headerItem.addSubItem(chat_enc_timer, LocaleController.getString("SetTimer", R.string.SetTimer), 0); } - /* EDIT BY MR -- it's not yet clear how messages should be deleted and/or chats can be leaved; disable this for the moment + /* EDIT BY MR -- it's not yet clear if and how messages can be deleted and/or chats can be leaved; disable this for the moment if (!ChatObject.isChannel(currentChat)) { headerItem.addSubItem(clear_history, LocaleController.getString("ClearHistory", R.string.ClearHistory), 0); if (currentChat != null && !isBroadcast) {