From b5999f5f597f5f6bbe02328423fd8e8900a18faa Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Fri, 17 Jan 2014 13:44:58 +0100
Subject: [PATCH] Restores some of removed/changed methods for backward
 compatibility with old OTR bundle used on Android.

---
 ...ractOperationSetBasicInstantMessaging.java |  8 +++++
 .../OperationSetBasicInstantMessaging.java    | 16 ++++++++++
 .../communicator/util/ConfigurationUtils.java | 29 ++++++++++++++++++-
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicInstantMessaging.java b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicInstantMessaging.java
index fe4f90f75..d3c42eb72 100644
--- a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicInstantMessaging.java
+++ b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicInstantMessaging.java
@@ -125,6 +125,14 @@ public Message createMessageWithUID(
         return createMessage(messageText);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public Message createMessageWithUID(String messageText, String messageUID)
+    {
+        return createMessage(messageText);
+    }
+
     public abstract Message createMessage(
         String content, String contentType, String encoding, String subject);
 
diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetBasicInstantMessaging.java b/src/net/java/sip/communicator/service/protocol/OperationSetBasicInstantMessaging.java
index e04cd1531..b4b3c2971 100644
--- a/src/net/java/sip/communicator/service/protocol/OperationSetBasicInstantMessaging.java
+++ b/src/net/java/sip/communicator/service/protocol/OperationSetBasicInstantMessaging.java
@@ -68,6 +68,22 @@ public Message createMessage(String content, String contentType,
     public Message createMessageWithUID(
         String messageText, String contentType, String messageUID);
 
+    /**
+     * Create a Message instance with the specified UID and a default
+     * (text/plain) content type and encoding.
+     * This method can be useful when message correction is required. One can
+     * construct the corrected message to have the same UID as the message
+     * before correction.
+     *
+     * @param messageText the string content of the message.
+     * @param messageUID the unique identifier of this message.
+     * @return Message the newly created message
+     *
+     * @deprecated Method will be removed once OTR bundle is updated on Android.
+     */
+    @Deprecated
+    public Message createMessageWithUID(String messageText, String messageUID);
+
     /**
      * Sends the <tt>message</tt> to the destination indicated by the
      * <tt>to</tt> contact.
diff --git a/src/net/java/sip/communicator/util/ConfigurationUtils.java b/src/net/java/sip/communicator/util/ConfigurationUtils.java
index 4230cb9d9..925a34fd9 100644
--- a/src/net/java/sip/communicator/util/ConfigurationUtils.java
+++ b/src/net/java/sip/communicator/util/ConfigurationUtils.java
@@ -14,6 +14,7 @@
 
 import javax.net.ssl.*;
 
+import net.java.sip.communicator.service.msghistory.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
 
@@ -1098,8 +1099,34 @@ public static void setLeaveChatRoomOnWindowClose(boolean isLeave)
             Boolean.toString(isLeaveChatRoomOnWindowCloseEnabled));
     }
 
-    
+    /**
+     * Returns <code>true</code> if the "IS_MESSAGE_HISTORY_ENABLED"
+     * property is true, otherwise - returns <code>false</code>.
+     * Indicates to the user interface whether the history logging is enabled.
+     * @return <code>true</code> if the "IS_MESSAGE_HISTORY_ENABLED"
+     * property is true, otherwise - returns <code>false</code>.
+     *
+     * @deprecated Method will be removed once OTR bundle is updated on Android.
+     */
+    @Deprecated
+    public static boolean isHistoryLoggingEnabled()
+    {
+        return configService.getBoolean(
+            MessageHistoryService.PNAME_IS_MESSAGE_HISTORY_ENABLED, true);
+    }
 
+    /**
+     * Returns <code>true</code> if messages history is enabled.
+     * Parameter <tt>id</tt> is ignored as it's an adapter for Android version
+     * that has to work with old OTR bundle.
+     *
+     * @deprecated Method will be removed once OTR bundle is updated on Android.
+     */
+    @Deprecated
+    public static boolean isHistoryLoggingEnabled(String id)
+    {
+        return isHistoryLoggingEnabled();
+    }
 
     /**
      * Returns <code>true</code> if the "isHistoryShown" property is