Merge branch 'master' of git.fakecake.org:tt-rss-android

6 files changed, 19 insertions, 6 deletions

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 1506866d..fe018ad6 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="491"
-    android:versionName="1.257">
+    android:versionCode="493"
+    android:versionName="1.259">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
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 c140fe6c..36a20ada 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
@@ -338,6 +338,7 @@ public class ArticlePager extends StateSavedFragment {
 					put("include_header", "true");
 				}
 
+				put("resize", String.valueOf(m_activity.getScreenWidth()));
 			}			 
 		};
 
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 416e3f28..bff44fdc 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
@@ -17,6 +17,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.BitmapFactory;
+import android.graphics.Point;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
@@ -389,6 +390,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
 			builder.setExitAnimations(this, R.anim.slide_in_left, R.anim.slide_out_right);
 
 			builder.setToolbarColor(tvBackground.data);
+			builder.setShowTitle(true);
 
 			Intent shareIntent = getShareIntent(uri.toString(), null);
 
@@ -578,5 +580,13 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
 	public static void requestWidgetUpdate(Context context) {
 		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/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
index 3b9e122e..6f9055f6 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
@@ -123,7 +123,7 @@ public class GalleryActivity extends CommonActivity {
                                     .asBitmap()
                                     .skipMemoryCache(false)
                                     .diskCacheStrategy(DiskCacheStrategy.ALL)
-                                    .dontTransform()
+                                    //.dontTransform()
                                     .into(HeadlinesFragment.FLAVOR_IMG_MIN_SIZE, HeadlinesFragment.FLAVOR_IMG_MIN_SIZE)
                                     .get();
 
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 8ec7cc9b..8fedccc0 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
@@ -1,5 +1,6 @@
 package org.fox.ttrss;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -589,7 +590,7 @@ public class HeadlinesFragment extends StateSavedFragment {
 			final String sessionId = m_activity.getSessionId();
 			final boolean isCat = m_feed.is_cat;
 
-			HeadlinesRequest req = new HeadlinesRequest(getActivity().getApplicationContext(), m_activity, m_feed, m_articles) {
+			@SuppressLint("StaticFieldLeak") HeadlinesRequest req = new HeadlinesRequest(getActivity().getApplicationContext(), m_activity, m_feed, m_articles) {
 				@Override
 				protected void onProgressUpdate(Integer... progress) {
 					m_activity.setProgress(Math.round((((float) progress[0] / (float) progress[1]) * 10000)));
@@ -714,6 +715,7 @@ public class HeadlinesFragment extends StateSavedFragment {
 					put("include_nested", "true");
                     put("has_sandbox", "true");
 					put("order_by", m_activity.getSortMode());
+					put("resize", String.valueOf(m_activity.getScreenWidth()));
 
 					if (isCat) put("is_cat", "true");
 
@@ -1240,7 +1242,7 @@ public class HeadlinesFragment extends StateSavedFragment {
 
 						Glide.with(HeadlinesFragment.this)
 								.load(article.flavorImageUri)
-								.dontTransform()
+								//.dontTransform()
 								.diskCacheStrategy(DiskCacheStrategy.ALL)
 								.skipMemoryCache(false)
 								.listener(new RequestListener<String, GlideDrawable>() {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index d6e0a680..e188f69a 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -1002,7 +1002,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 
 							Glide.with(OfflineHeadlinesFragment.this)
 									.load(afi.flavorImageUri)
-									.dontTransform()
+									//.dontTransform()
 									.diskCacheStrategy(DiskCacheStrategy.NONE)
 									.skipMemoryCache(false)
 									.listener(new RequestListener<String, GlideDrawable>() {