From b976e47fe5e83dd1c635befee44d453c9a70d180 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Tue, 20 Nov 2018 09:33:57 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=AE=E3=80=8C=E3=83=97=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E3=82=92=E5=8F=96=E5=BE=97=E3=81=97?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=80=8D=E3=82=92=E5=89=8A=E9=99=A4=E3=80=82?=
 =?UTF-8?q?=E3=80=8C=E3=83=97=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC=E3=82=AB?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=80=8D=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jp/juggler/subwaytooter/Column.kt    | 27 ++++++++++---------
 .../jp/juggler/subwaytooter/ItemViewHolder.kt |  8 +++---
 .../main/java/jp/juggler/subwaytooter/Pref.kt |  9 ++++---
 app/src/main/res/layout/act_app_setting.xml   |  4 +--
 app/src/main/res/values-ja/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/Column.kt b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
index 5827ee03..108deaa2 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Column.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
@@ -2996,20 +2996,21 @@ class Column(
 									)
 								}
 								
-								// カードを取得する
-								if(! Pref.bpDontRetrievePreviewCard(context)) {
-									this.list_tmp?.forEach { o ->
-										if(o is TootStatus && o.card == null)
-											o.card = parseItem(
-												::TootCard,
-												client.request("/api/v1/statuses/" + o.id + "/card")?.jsonObject
-											)
-									}
-								}
+								// マストドン2.6でTLにカード情報がレンダリングされたことにより、
+								// 個別にカードを取得する機能は ST3.0.7で廃止される
+								// この機能はRate limitの問題を引き起こすことが多かった
+								// if(! Pref.bpDontRetrievePreviewCard(context)) {
+								// 									this.list_tmp?.forEach { o ->
+								//										// カードを取得する
+								//										if(o is TootStatus && o.card == null)
+								//											o.card = parseItem(
+								//												::TootCard,
+								//												client.request("/api/v1/statuses/" + o.id + "/card")?.jsonObject
+								//											)
+								//									}
+								//								}
 								
-								//
 								return result
-								
 							}
 						}
 						
@@ -6884,7 +6885,7 @@ class Column(
 		else -> defaultColorHeaderBg
 	}
 	
-	fun setHeaderBackground( view : View) {
+	fun setHeaderBackground(view : View) {
 		ViewCompat.setBackground(
 			view,
 			Styler.getAdaptiveRippleDrawable(
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt b/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt
index c9236747..1f0a0497 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt
@@ -1060,8 +1060,7 @@ internal class ItemViewHolder(
 			}
 		}
 		
-		// カードの表示(会話ビューのみ)
-		showPreviewCard(activity, status)
+		showPreviewCard(status)
 		
 		//			if( status.decoded_tags == null ){
 		//				tvTags.setVisibility( View.GONE );
@@ -1784,7 +1783,10 @@ internal class ItemViewHolder(
 		}
 	}
 	
-	private fun showPreviewCard(activity : ActMain, status : TootStatus) {
+	private fun showPreviewCard(status : TootStatus) {
+		
+		if(Pref.bpDontShowPreviewCard(activity.pref)) return
+		
 		val card = status.card ?: return
 		
 		// 会話カラムで返信ステータスなら捏造したカードを表示しない
diff --git a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
index 09caef6e..5b654f2d 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
@@ -335,11 +335,12 @@ object Pref {
 		R.id.swSendAccessTokenToAppServer
 	)
 	
-	val bpDontRetrievePreviewCard = BooleanPref(
-		"DontRetrievePreviewCard",
-		true,
-		R.id.swDontRetrievePreviewCard
+	val bpDontShowPreviewCard = BooleanPref(
+		"DontShowPreviewCard",
+		false,
+		R.id.swDontShowPreviewCard
 	)
+	
 	val bpScrollTopFromColumnStrip = BooleanPref(
 		"ScrollTopFromColumnStrip",
 		false,
diff --git a/app/src/main/res/layout/act_app_setting.xml b/app/src/main/res/layout/act_app_setting.xml
index 9a675660..c4681647 100644
--- a/app/src/main/res/layout/act_app_setting.xml
+++ b/app/src/main/res/layout/act_app_setting.xml
@@ -316,13 +316,13 @@
 
         <TextView
             style="@style/setting_row_label"
-            android:text="@string/dont_retrieve_preview_card"
+            android:text="@string/dont_show_preview_card"
             />
 
         <LinearLayout style="@style/setting_row_form">
 
             <Switch
-                android:id="@+id/swDontRetrievePreviewCard"
+                android:id="@+id/swDontShowPreviewCard"
                 style="@style/setting_horizontal_stretch"
                 android:gravity="center"
                 />
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 973f7f85..cd19c477 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -803,5 +803,6 @@
     <string name="content_acct_color">内容のAcctの文字色</string>
     <string name="content_text_color">内容の本文の文字色</string>
     <string name="quick_toot_bar_background_color">簡易投稿入力の背景色</string>
+    <string name="dont_show_preview_card">プレビューカードを表示しない</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca8f096f..e5051dcf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -821,5 +821,6 @@
     <string name="content_acct_color">Content acct color</string>
     <string name="content_text_color">Content text color</string>
     <string name="quick_toot_bar_background_color">Quick toot bar background color</string>
+    <string name="dont_show_preview_card">Don\'t show preview card</string>
 
 </resources>