From f56df676d0e4a7f51c1523867225762acb581310 Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Wed, 14 Dec 2016 17:12:49 +0800
Subject: [PATCH] fixed #653

---
 .../twidere/model/util/ParcelableDirectMessageUtils.java   | 2 +-
 .../twidere/util/InternalTwitterContentUtils.java          | 2 +-
 .../mariotaku/twidere/fragment/DirectMessagesFragment.kt   | 5 ++---
 .../org/mariotaku/twidere/task/SaveMediaToGalleryTask.kt   | 7 ++++++-
 twidere/src/main/res/values-v21/config.xml                 | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableDirectMessageUtils.java b/twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableDirectMessageUtils.java
index fc286e725..997a55605 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableDirectMessageUtils.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableDirectMessageUtils.java
@@ -35,7 +35,7 @@ public class ParcelableDirectMessageUtils {
         final Pair<String, SpanItem[]> pair = InternalTwitterContentUtils.formatDirectMessageText(message);
         result.text_unescaped = pair.first;
         result.spans = pair.second;
-        result.text_plain = message.getText();
+        result.text_plain = InternalTwitterContentUtils.unescapeTwitterStatusText(message.getText());
         result.sender_name = sender.getName();
         result.recipient_name = recipient.getName();
         result.sender_screen_name = sender.getScreenName();
diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java
index 170c22c09..50aa3052b 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java
@@ -217,7 +217,7 @@ public class InternalTwitterContentUtils {
 
     @NonNull
     public static Pair<String, SpanItem[]> formatDirectMessageText(@NonNull final DirectMessage message) {
-        final HtmlBuilder builder = new HtmlBuilder(message.getText(), false, true, true);
+        final HtmlBuilder builder = new HtmlBuilder(message.getText(), false, true, false);
         parseEntities(builder, message);
         return builder.buildWithIndices();
     }
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DirectMessagesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DirectMessagesFragment.kt
index d94f502a1..448da56e4 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DirectMessagesFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DirectMessagesFragment.kt
@@ -223,9 +223,8 @@ class DirectMessagesFragment : AbsContentListRecyclerViewFragment<MessageEntries
             override fun doInBackground(vararg params: Any): RefreshTaskParam? {
                 val context = context ?: return null
                 val accountIds = accountKeys
-                val ids = DataStoreUtils.getNewestMessageIds(context,
-                        Inbox.CONTENT_URI, accountIds)
-                return BaseRefreshTaskParam(accountIds, ids, null)
+                val ids = DataStoreUtils.getNewestMessageIds(context, Inbox.CONTENT_URI, accountIds)
+                return BaseRefreshTaskParam(accountIds, maxIds = null, sinceIds = ids)
             }
 
             override fun onPostExecute(result: RefreshTaskParam?) {
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/SaveMediaToGalleryTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/SaveMediaToGalleryTask.kt
index ccf8902bb..2f85cd702 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/SaveMediaToGalleryTask.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/SaveMediaToGalleryTask.kt
@@ -31,7 +31,12 @@ import java.io.File
 /**
  * Created by mariotaku on 15/12/28.
  */
-class SaveMediaToGalleryTask(activity: Activity, source: Uri, destination: File, type: String) : ProgressSaveFileTask(activity, source, destination, CacheProvider.CacheFileTypeCallback(activity, type)) {
+class SaveMediaToGalleryTask(
+        activity: Activity,
+        source: Uri,
+        destination: File,
+        type: String
+) : ProgressSaveFileTask(activity, source, destination, CacheProvider.CacheFileTypeCallback(activity, type)) {
 
     override fun onFileSaved(savedFile: File, mimeType: String?) {
         val context = context ?: return
diff --git a/twidere/src/main/res/values-v21/config.xml b/twidere/src/main/res/values-v21/config.xml
index bdc19b41d..82c23cba6 100644
--- a/twidere/src/main/res/values-v21/config.xml
+++ b/twidere/src/main/res/values-v21/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="use_job_refresh_service">true</bool>
-    <bool name="use_legacy_refresh_service">false</bool>
+    <!--<bool name="use_job_refresh_service">true</bool>-->
+    <!--<bool name="use_legacy_refresh_service">false</bool>-->
 </resources>
\ No newline at end of file