diff --git a/app/src/main/java/jp/juggler/subwaytooter/Column.kt b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
index e36e746e..32c946df 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Column.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
@@ -1807,12 +1807,14 @@ class Column(
}
// カードを取得する
- this.list_tmp?.forEach { o ->
- if(o is TootStatus)
- o.card = parseItem(
- ::TootCard,
- client.request("/api/v1/statuses/" + o.id + "/card")?.jsonObject
- )
+ if( ! Pref.bpDontRetrievePreviewCard(context) ) {
+ this.list_tmp?.forEach { o ->
+ if(o is TootStatus)
+ o.card = parseItem(
+ ::TootCard,
+ client.request("/api/v1/statuses/" + o.id + "/card")?.jsonObject
+ )
+ }
}
//
diff --git a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
index 9248e424..7433613b 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
@@ -307,6 +307,13 @@ object Pref {
R.id.swSendAccessTokenToAppServer
)
+ val bpDontRetrievePreviewCard = BooleanPref(
+ "DontRetrievePreviewCard",
+ false,
+ R.id.swDontRetrievePreviewCard
+ )
+
+
// int
val ipBackButtonAction = IntPref("back_button_action", 0)
diff --git a/app/src/main/java/jp/juggler/subwaytooter/view/MyNetworkImageView.kt b/app/src/main/java/jp/juggler/subwaytooter/view/MyNetworkImageView.kt
index 6398635f..2f00171d 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/view/MyNetworkImageView.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/view/MyNetworkImageView.kt
@@ -202,7 +202,7 @@ class MyNetworkImageView : AppCompatImageView {
.build()
val glideUrl = GlideUrl(url, glideHeaders)
-
+
getGlide()?.asBitmap()?.load(glideUrl)
?.into(MyTarget(url, desiredWidth, desiredHeight))
}
diff --git a/app/src/main/res/layout/act_app_setting.xml b/app/src/main/res/layout/act_app_setting.xml
index 6650c2d2..67fdc642 100644
--- a/app/src/main/res/layout/act_app_setting.xml
+++ b/app/src/main/res/layout/act_app_setting.xml
@@ -129,6 +129,7 @@
/>
+
-
-
@@ -281,7 +280,22 @@
+
+
+
+
+
+
+
+
@@ -652,7 +666,6 @@
-
-
-
Direct messages
Unfavourite
Unboost
+ Don\'t retrieve preview card
-
+
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4680a536..a47fa0b0 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -925,4 +925,5 @@
ダイレクトメッセージ
お気に入り解除
ブースト解除
+ プレビューカードを取得しない
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8eeca39d..095a6312 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -632,4 +632,5 @@
Direct messages
Unfavourite
Unboost
+ Don\'t retrieve preview card