From 88163eb57e2b3f0be0a24d69f69d5af4ff650233 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 15 Aug 2019 12:09:22 +0300
Subject: resize to shortest screen dimension instead of width

---
 org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java    |  2 +-
 org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java  |  7 -------
 .../src/main/java/org/fox/ttrss/HeadlinesFragment.java         |  2 +-
 org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java  | 10 ++++++++++
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
index 2f373f04..c885b732 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
@@ -340,7 +340,7 @@ public class ArticlePager extends StateSavedFragment {
 
 				if (m_prefs.getBoolean("enable_image_downsampling", false)) {
 					if (!m_activity.isWifiConnected()) {
-						put("resize_width", String.valueOf(m_activity.getScreenWidth() * 0.75));
+						put("resize_width", String.valueOf(m_activity.getResizeWidth()));
 					}
 				}
 			}			 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
index dea5c61e..493676d8 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -582,12 +582,5 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
 		JobIntentService.enqueueWork(context.getApplicationContext(), WidgetUpdateService.class, 0, new Intent());
 	}
 
-    public int getScreenWidth() {
-		Display display = getWindowManager().getDefaultDisplay();
-		Point size = new Point();
-		display.getSize(size);
-
-		return size.x;
-    }
 }
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index ed3c7b24..933c4b28 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -719,7 +719,7 @@ public class HeadlinesFragment extends StateSavedFragment {
 
 					if (m_prefs.getBoolean("enable_image_downsampling", false)) {
 						if (!m_activity.isWifiConnected()) {
-							put("resize_width", String.valueOf(m_activity.getScreenWidth() * 0.75));
+							put("resize_width", String.valueOf(m_activity.getResizeWidth()));
 						}
 					}
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index 54e717f2..1cfd830b 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -14,12 +14,14 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.graphics.Point;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.view.Display;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -1575,4 +1577,12 @@ public class OnlineActivity extends CommonActivity {
 
 		return false;
 	}
+
+	public int getResizeWidth() {
+		Display display = getWindowManager().getDefaultDisplay();
+		Point size = new Point();
+		display.getSize(size);
+
+		return size.x > size.y ? (int)(size.y * 0.75) : (int)(size.x * 0.75);
+	}
 }
-- 
cgit v1.2.3