add resize_enabled/resize_width to headline requests

3 files changed, 19 insertions, 4 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 2124ee5f..4fc53587 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,7 +338,8 @@ public class ArticlePager extends StateSavedFragment {
 					put("include_header", "true");
 				}
 
-				put("resize", String.valueOf(m_activity.getScreenWidth()));
+				put("resize_width", String.valueOf(m_activity.getScreenWidth()/2));
+				put("resize_enabled", String.valueOf(!m_activity.isWifiConnected()));
 			}			 
 		};
 
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 c16c08cc..7e483e11 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
@@ -716,7 +716,8 @@ 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()));
+					put("resize_width", String.valueOf(m_activity.getScreenWidth()/2));
+					put("resize_enabled", String.valueOf(!m_activity.isWifiConnected()));
 
 					if (isCat) put("is_cat", "true");
 
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 e82fb272..54e717f2 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,6 +14,8 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -61,6 +63,7 @@ public class OnlineActivity extends CommonActivity {
 	private HeadlinesActionModeCallback m_headlinesActionModeCallback;
 
 	private String m_lastImageHitTestUrl;
+	private ConnectivityManager m_cmgr;
 
 	//protected PullToRefreshAttacher m_pullToRefreshAttacher;
 
@@ -148,6 +151,8 @@ public class OnlineActivity extends CommonActivity {
 		Toolbar toolbar = findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
 
+		m_cmgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+
 		Intent intent = getIntent();
 
         Log.d(TAG, "intent action=" + intent.getAction());
@@ -1111,7 +1116,7 @@ public class OnlineActivity extends CommonActivity {
 		
 		return true;
 	}
-	
+
 	public int getApiLevel() {
 		return Application.getInstance().m_apiLevel;
 	}
@@ -1212,7 +1217,7 @@ public class OnlineActivity extends CommonActivity {
 		String tmp = "";
 
 		for (Article a : articles)
-			tmp += String.valueOf(a.id) + ",";
+			tmp += a.id + ",";
 
 		return tmp.replaceAll(",$", "");
 	}
@@ -1562,4 +1567,12 @@ public class OnlineActivity extends CommonActivity {
 		return m_lastImageHitTestUrl;
 	}
 
+	public boolean isWifiConnected() {
+		NetworkInfo wifi = m_cmgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+
+		if (wifi != null)
+			return wifi.isConnected();
+
+		return false;
+	}
 }