Removed old hybrid reader

Author: nbradbury

AndroidManifest.xml

@@ -208,9 +208,6 @@
         <activity
             android:name=".ui.DashboardActivity"
             android:configChanges="orientation|keyboardHidden|screenSize" />
-        <activity
-            android:name=".ui.reader.ReaderActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
         <activity android:name=".ui.ViewSiteActivity"
             android:configChanges="orientation|keyboardHidden|screenSize" >
         </activity>

src/org/wordpress/android/Constants.java

@@ -37,9 +37,6 @@ public class Constants {
     public static final int READER_MAX_USERS_TO_DISPLAY    = 500;                         // max #users to show in ReaderUserListActivity
     public static final long READER_AUTO_UPDATE_DELAY_MINUTES = 15;                       // 15 minute delay between automatic updates
 
-    // set this to false to revert to the old hybrid reader
-    public static final boolean ENABLE_NATIVE_READER = true;
-
     // Reader intent IDs
     public static final int INTENT_READER_POST_DETAIL = 1000;
     public static final int INTENT_READER_TAGS        = 1001;

src/org/wordpress/android/ui/WPActionBarActivity.java

@@ -53,7 +53,6 @@
 import org.wordpress.android.ui.posts.PagesActivity;
 import org.wordpress.android.ui.posts.PostsActivity;
 import org.wordpress.android.ui.prefs.PreferencesActivity;
-import org.wordpress.android.ui.reader.ReaderActivity;
 import org.wordpress.android.ui.reader_native.NativeReaderActivity;
 import org.wordpress.android.ui.stats.StatsActivity;
 import org.wordpress.android.ui.themes.ThemeBrowserActivity;
@@ -690,23 +689,13 @@ public Boolean isVisible(){
 
         @Override
         public Boolean isSelected(){
-            if (Constants.ENABLE_NATIVE_READER) {
-                return WPActionBarActivity.this instanceof NativeReaderActivity;
-            } else {
-                return WPActionBarActivity.this instanceof ReaderActivity;
-            }
+            return WPActionBarActivity.this instanceof NativeReaderActivity;
         }
         @Override
         public void onSelectItem(){
-            if (!(WPActionBarActivity.this instanceof ReaderActivity))
-                mShouldFinish = true;
             int readerBlogID = WordPress.wpDB.getWPCOMBlogID();
             Intent intent;
-            if (Constants.ENABLE_NATIVE_READER) {
-                intent = new Intent(WPActionBarActivity.this, NativeReaderActivity.class);
-            } else {
-                intent = new Intent(WPActionBarActivity.this, ReaderActivity.class);
-            }
+            intent = new Intent(WPActionBarActivity.this, NativeReaderActivity.class);
             intent.putExtra("id", readerBlogID);
             intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
             startActivityWithDelay(intent);