remove compat mode, set minimum sdk version to 16 (jelly bean)

12 files changed, 35 insertions, 100 deletions

diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle
index aa8b959c..7be86dd8 100644
--- a/org.fox.ttrss/build.gradle
+++ b/org.fox.ttrss/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "org.fox.ttrss"
-        minSdkVersion 8
+        minSdkVersion 16
         targetSdkVersion 21
     }
 
diff --git a/org.fox.ttrss/org.fox.ttrss.iml b/org.fox.ttrss/org.fox.ttrss.iml
index 34b64e90..14d85977 100644
--- a/org.fox.ttrss/org.fox.ttrss.iml
+++ b/org.fox.ttrss/org.fox.ttrss.iml
@@ -79,6 +79,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 31626cc4..cdbf269b 100644
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
     android:versionName="1.86" >
 
     <uses-sdk
-        android:minSdkVersion="10"
+        android:minSdkVersion="16"
         android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 930a322d..541ed28c 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -14,7 +14,6 @@ import android.text.Html;
 import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -32,10 +31,6 @@ import com.shamanland.fab.ShowHideOnScroll;
 import org.fox.ttrss.types.Article;
 import org.fox.ttrss.types.Attachment;
 import org.fox.ttrss.util.TypefaceCache;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
 
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -308,11 +303,6 @@ public class ArticleFragment extends Fragment  {
 							unregisterForContextMenu(m_web);
 							return true;
 						} else {
-							if (m_activity.isCompatMode()) {
-								KeyEvent shiftPressEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_SHIFT_LEFT, 0, 0);
-								shiftPressEvent.dispatch(m_web);
-							}
-							
 							return false;
 						}
 					}
@@ -356,30 +346,11 @@ public class ArticleFragment extends Fragment  {
 
 				String articleContent = m_article.content != null ? m_article.content : "";
 
-                if (m_activity.isCompatMode() || !acceleratedWebview) {
-                    Document doc = Jsoup.parse(articleContent);
-
-                    if (doc != null) {
-                        // thanks webview for crashing on <video> tag
-                        Elements videos = doc.select("video");
-
-                        for (Element video : videos)
-                            video.remove();
+                if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                    ws.setJavaScriptEnabled(true);
 
-                        videos = doc.select("iframe");
-
-                        for (Element video : videos)
-                            video.remove();
-
-                        articleContent = doc.toString();
-                    }
-                } else {
-                    if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        ws.setJavaScriptEnabled(true);
-
-                        m_chromeClient = new FSVideoChromeClient(view);
-                        m_web.setWebChromeClient(m_chromeClient);
-                    }
+                    m_chromeClient = new FSVideoChromeClient(view);
+                    m_web.setWebChromeClient(m_chromeClient);
                 }
 
 				if (m_prefs.getBoolean("justify_article_text", true)) {
@@ -525,18 +496,14 @@ public class ArticleFragment extends Fragment  {
     public void onPause() {
         super.onPause();
 
-        if (!m_activity.isCompatMode()) {
-            m_web.onPause();
-        }
+        m_web.onPause();
     }
 
     @Override
     public void onResume() {
         super.onResume();
 
-        if (!m_activity.isCompatMode()) {
-            m_web.onResume();
-        }
+        m_web.onResume();
     }
 
     public boolean inCustomView() {
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 2a4ea712..705de8af 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -36,7 +36,6 @@ public class CommonActivity extends ActionBarActivity {
 	private SQLiteDatabase m_writableDb;
 
 	private boolean m_smallScreenMode = true;
-	private boolean m_compatMode = false;
 	private String m_theme;
     private boolean m_fullScreen;
 
@@ -141,11 +140,7 @@ public class CommonActivity extends ActionBarActivity {
 		}
 		
 		initDatabase();
-				
-		m_compatMode = android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB;
 
-		Log.d(TAG, "m_compatMode=" + m_compatMode);
-		
 		super.onCreate(savedInstanceState);
 	}
 
@@ -165,10 +160,6 @@ public class CommonActivity extends ActionBarActivity {
 	public boolean isSmallScreen() {
 		return m_smallScreenMode;
 	}
-	
-	public boolean isCompatMode() {
-		return m_compatMode;
-	}
 
 	@SuppressWarnings("deprecation")
 	public boolean isPortrait() {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
index 4f793f5b..adeb044e 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
@@ -208,14 +208,11 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
 			}
 		});
 
-	    if (!m_activity.isCompatMode()) {
-	    	m_swipeLayout.setColorScheme(android.R.color.holo_green_dark, 
-	    		android.R.color.holo_red_dark, 
-	            android.R.color.holo_blue_dark, 
-	            android.R.color.holo_orange_dark);
-	    }
+        m_swipeLayout.setColorScheme(android.R.color.holo_green_dark,
+            android.R.color.holo_red_dark,
+            android.R.color.holo_blue_dark,
+            android.R.color.holo_orange_dark);
 
-		
 		ListView list = (ListView)view.findViewById(R.id.feeds);		
 		m_adapter = new FeedCategoryListAdapter(getActivity(), R.layout.feeds_row, (ArrayList<FeedCategory>)m_cats);
 		list.setAdapter(m_adapter);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index 704c03f7..33f1a71c 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -279,12 +279,10 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
 			}
 		});
 
-	    if (!m_activity.isCompatMode()) {
-	    	m_swipeLayout.setColorScheme(android.R.color.holo_green_dark, 
-	    		android.R.color.holo_red_dark, 
-	            android.R.color.holo_blue_dark, 
-	            android.R.color.holo_orange_dark);
-	    }
+        m_swipeLayout.setColorScheme(android.R.color.holo_green_dark,
+            android.R.color.holo_red_dark,
+            android.R.color.holo_blue_dark,
+            android.R.color.holo_orange_dark);
 
         /* Button parentBtn = (Button) view.findViewById(R.id.open_parent);
 
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 e14bd587..cb4ba889 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -324,14 +324,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 			}
 		});
 
-	    if (!m_activity.isCompatMode()) {
-	    	m_swipeLayout.setColorScheme(android.R.color.holo_green_dark, 
-	    		android.R.color.holo_red_dark, 
-	            android.R.color.holo_blue_dark, 
-	            android.R.color.holo_orange_dark);
-	    }
+        m_swipeLayout.setColorScheme(android.R.color.holo_green_dark,
+            android.R.color.holo_red_dark,
+            android.R.color.holo_blue_dark,
+            android.R.color.holo_orange_dark);
 
-		
 		ListView list = (ListView)view.findViewById(R.id.headlines_list);
 
         if (!m_compactLayoutMode) {
@@ -947,12 +944,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
                                     flavorImageLoadingBar.setVisibility(View.INVISIBLE);
 
                                     if (arg2.getWidth() > FLAVOR_IMG_MIN_WIDTH && arg2.getHeight() > FLAVOR_IMG_MIN_HEIGHT) {
-                                        if (!m_activity.isCompatMode() && weNeedAnimation) {
-
+                                        if (weNeedAnimation) {
                                             ObjectAnimator anim = ObjectAnimator.ofFloat(flavorImageView, "alpha", 0f, 1f);
                                             anim.setDuration(200);
                                             anim.start();
-
                                         }
                                         //flavorImageHolder.setVisibility(View.VISIBLE);
                                     } else {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index ace49c8b..3b2064d7 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -5,7 +5,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
-import android.graphics.Color;
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
@@ -16,7 +15,6 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -29,7 +27,6 @@ import android.widget.TextView;
 
 import com.shamanland.fab.ShowHideOnScroll;
 
-import org.fox.ttrss.CommonActivity;
 import org.fox.ttrss.R;
 import org.fox.ttrss.util.ImageCacheService;
 import org.fox.ttrss.util.TypefaceCache;
@@ -240,11 +237,6 @@ public class OfflineArticleFragment extends Fragment {
                             unregisterForContextMenu(web);
                             return true;
                         } else {
-                            if (m_activity.isCompatMode()) {
-                                KeyEvent shiftPressEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_SHIFT_LEFT, 0, 0);
-                                shiftPressEvent.dispatch(web);
-                            }
-
                             return false;
                         }
                     }
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
index 9f495ad6..f5f0d227 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
@@ -139,12 +139,10 @@ public class OfflineFeedCategoriesFragment extends Fragment implements OnItemCli
             }
         });
 
-        if (!m_activity.isCompatMode()) {
-            m_swipeLayout.setColorScheme(android.R.color.holo_green_dark,
-                    android.R.color.holo_red_dark,
-                    android.R.color.holo_blue_dark,
-                    android.R.color.holo_orange_dark);
-        }
+        m_swipeLayout.setColorScheme(android.R.color.holo_green_dark,
+                android.R.color.holo_red_dark,
+                android.R.color.holo_blue_dark,
+                android.R.color.holo_orange_dark);
 
 		ListView list = (ListView)view.findViewById(R.id.feeds);
 		
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java
index 20ffb4c7..fa41ab31 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java
@@ -152,12 +152,10 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene
             }
         });
 
-        if (!m_activity.isCompatMode()) {
-            m_swipeLayout.setColorScheme(android.R.color.holo_green_dark,
-                    android.R.color.holo_red_dark,
-                    android.R.color.holo_blue_dark,
-                    android.R.color.holo_orange_dark);
-        }
+        m_swipeLayout.setColorScheme(android.R.color.holo_green_dark,
+                android.R.color.holo_red_dark,
+                android.R.color.holo_blue_dark,
+                android.R.color.holo_orange_dark);
 
 		ListView list = (ListView)view.findViewById(R.id.feeds);
 
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 edcaa1fd..454cb1a4 100644
--- 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
@@ -302,13 +302,11 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 			}
 		});
 
-	    if (!m_activity.isCompatMode()) {
-	    	m_swipeLayout.setColorScheme(android.R.color.holo_green_dark, 
-	    		android.R.color.holo_red_dark, 
-	            android.R.color.holo_blue_dark, 
-	            android.R.color.holo_orange_dark);
-	    }
-		
+        m_swipeLayout.setColorScheme(android.R.color.holo_green_dark,
+            android.R.color.holo_red_dark,
+            android.R.color.holo_blue_dark,
+            android.R.color.holo_orange_dark);
+
 		m_cursor = createCursor();
 		
 		ListView list = (ListView)view.findViewById(R.id.headlines_list);