unconfigurable request count per page

11 files changed, 10 insertions, 49 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/preference/UserPreferenceHelper.java b/app/src/main/java/net/lacolaco/smileessence/preference/UserPreferenceHelper.java
index 046b02a1..de580b88 100644
--- a/app/src/main/java/net/lacolaco/smileessence/preference/UserPreferenceHelper.java
+++ b/app/src/main/java/net/lacolaco/smileessence/preference/UserPreferenceHelper.java
@@ -56,8 +56,4 @@ public class UserPreferenceHelper extends SharedPreferenceHelper {
     public int getTextSize() {
         return get(R.string.key_setting_text_size, 10);
     }
-
-    public int getRequestCountPerPage() {
-        return get(R.string.key_setting_timelines, 20);
-    }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java
index 328f2151..ee8f8170 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java
@@ -68,17 +68,6 @@ public class SettingFragment extends PreferenceFragment implements OnSharedPrefe
                 Notificator.getInstance().alert(R.string.error_setting_text_size_not_number);
             }
             return false;
-        } else if (preference.getKey().contentEquals(getString(R.string.key_setting_timelines))) {
-            if (TextUtils.isDigitsOnly(newValueStr)) {
-                int newTextSize = Integer.parseInt(newValueStr);
-                if (TIMELINES_MIN <= newTextSize && newTextSize <= TIMELINES_MAX) {
-                    return true;
-                }
-                Notificator.getInstance().alert(R.string.error_setting_timelines_range);
-            } else {
-                Notificator.getInstance().alert(R.string.error_setting_timelines_not_number);
-            }
-            return false;
         } else if (preference.getKey().contentEquals(getString(R.string.key_setting_theme))) {
             Notificator.getInstance().publish(R.string.notice_theme_changed);
         }
@@ -121,9 +110,6 @@ public class SettingFragment extends PreferenceFragment implements OnSharedPrefe
         ListPreference themePreference = (ListPreference) findPreference(R.string.key_setting_theme);
         themePreference.setSummary(themePreference.getEntry());
         themePreference.setOnPreferenceChangeListener(this);
-        EditTextPreference timelinesPreference = (EditTextPreference) findPreference(R.string.key_setting_timelines);
-        timelinesPreference.setSummary(String.format(getString(R.string.setting_timelines_summary_format), timelinesPreference.getText()));
-        timelinesPreference.setOnPreferenceChangeListener(this);
         Preference appInfoPreference = findPreference(R.string.key_setting_application_information);
         appInfoPreference.setOnPreferenceClickListener(this);
         appInfoPreference.setSummary(BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ")");
@@ -177,7 +163,5 @@ public class SettingFragment extends PreferenceFragment implements OnSharedPrefe
         textSizePreference.setSummary(textSizePreference.getText());
         ListPreference themePreference = (ListPreference) findPreference(R.string.key_setting_theme);
         themePreference.setSummary(themePreference.getEntry());
-        EditTextPreference timelinesPreference = (EditTextPreference) findPreference(R.string.key_setting_timelines);
-        timelinesPreference.setSummary(String.format(getString(R.string.setting_timelines_summary_format), timelinesPreference.getText()));
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java
index d63fa1e1..2153d356 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java
@@ -47,7 +47,6 @@ import net.lacolaco.smileessence.entity.RBinding;
 import net.lacolaco.smileessence.entity.Tweet;
 import net.lacolaco.smileessence.entity.User;
 import net.lacolaco.smileessence.notification.Notificator;
-import net.lacolaco.smileessence.preference.UserPreferenceHelper;
 import net.lacolaco.smileessence.twitter.task.FollowTask;
 import net.lacolaco.smileessence.twitter.task.ShowFriendshipTask;
 import net.lacolaco.smileessence.twitter.task.UnfollowTask;
@@ -145,7 +144,7 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
     public void onPullDownToRefresh(final PullToRefreshBase<ListView> refreshView) {
         Account currentAccount = Application.getInstance().getCurrentAccount();
         new UserTimelineTask(currentAccount, getUserID())
-                .setCount(UserPreferenceHelper.getInstance().getRequestCountPerPage())
+                .setCount(200)
                 .setSinceId(adapter.getTopID())
                 .onFail(x -> Notificator.getInstance().alert(R.string.notice_error_get_user_timeline))
                 .onDoneUI(tweets -> {
@@ -162,7 +161,7 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
     public void onPullUpToRefresh(final PullToRefreshBase<ListView> refreshView) {
         Account currentAccount = Application.getInstance().getCurrentAccount();
         new UserTimelineTask(currentAccount, getUserID())
-                .setCount(UserPreferenceHelper.getInstance().getRequestCountPerPage())
+                .setCount(200)
                 .setMaxId(adapter.getLastID() - 1)
                 .onFail(x -> Notificator.getInstance().alert(R.string.notice_error_get_user_timeline))
                 .onDoneUI(tweets -> {
@@ -246,7 +245,7 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
         Account account = Application.getInstance().getCurrentAccount();
         tabHost.getTabWidget().getChildTabViewAt(1).setVisibility(View.GONE);
         new UserTimelineTask(account, user.getId())
-                .setCount(UserPreferenceHelper.getInstance().getRequestCountPerPage())
+                .setCount(200)
                 .onFail(x -> Notificator.getInstance().alert(R.string.notice_error_get_user_timeline))
                 .onDoneUI(tweets -> {
                     for (Tweet tweet : tweets) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/HomeFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/page/HomeFragment.java
index 16f65a9d..7ff534b1 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/HomeFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/HomeFragment.java
@@ -33,7 +33,6 @@ import net.lacolaco.smileessence.activity.MainActivity;
 import net.lacolaco.smileessence.entity.Tweet;
 import net.lacolaco.smileessence.logging.Logger;
 import net.lacolaco.smileessence.notification.Notificator;
-import net.lacolaco.smileessence.preference.UserPreferenceHelper;
 import net.lacolaco.smileessence.twitter.StatusFilter;
 import net.lacolaco.smileessence.twitter.task.HomeTimelineTask;
 import net.lacolaco.smileessence.twitter.task.TimelineTask;
@@ -117,7 +116,7 @@ public class HomeFragment extends CustomListFragment<StatusListAdapter> {
 
     private void runRefreshTask(TimelineTask<Tweet> task, Runnable onFinish) {
         task
-                .setCount(UserPreferenceHelper.getInstance().getRequestCountPerPage())
+                .setCount(200)
                 .onFail(e -> Notificator.getInstance().alert(R.string.notice_error_get_home))
                 .onDoneUI(tweets -> {
                     for (Tweet tweet : tweets) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/MentionsFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/page/MentionsFragment.java
index 46823e00..6d6f4b5e 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/MentionsFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/MentionsFragment.java
@@ -32,7 +32,6 @@ import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.data.ExtractionWord;
 import net.lacolaco.smileessence.entity.Tweet;
 import net.lacolaco.smileessence.notification.Notificator;
-import net.lacolaco.smileessence.preference.UserPreferenceHelper;
 import net.lacolaco.smileessence.twitter.StatusFilter;
 import net.lacolaco.smileessence.twitter.task.MentionsTimelineTask;
 import net.lacolaco.smileessence.twitter.task.TimelineTask;
@@ -116,7 +115,7 @@ public class MentionsFragment extends CustomListFragment<StatusListAdapter> {
 
     private void runRefreshTask(TimelineTask<Tweet> task, Runnable onFinish) {
         task
-                .setCount(UserPreferenceHelper.getInstance().getRequestCountPerPage())
+                .setCount(200)
                 .onFail(x -> Notificator.getInstance().alert(R.string.notice_error_get_mentions))
                 .onDoneUI(tweets -> {
                     for (Tweet tweet : tweets) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/MessagesFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/page/MessagesFragment.java
index e3b4c933..642c080c 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/MessagesFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/MessagesFragment.java
@@ -31,7 +31,6 @@ import net.lacolaco.smileessence.Application;
 import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.entity.DirectMessage;
 import net.lacolaco.smileessence.notification.Notificator;
-import net.lacolaco.smileessence.preference.UserPreferenceHelper;
 import net.lacolaco.smileessence.twitter.StatusFilter;
 import net.lacolaco.smileessence.twitter.task.DirectMessagesTask;
 import net.lacolaco.smileessence.twitter.task.SentDirectMessagesTask;
@@ -110,7 +109,7 @@ public class MessagesFragment extends CustomListFragment<MessageListAdapter> {
 
     private void runRefreshTask(TimelineTask<DirectMessage> task, Runnable onFinish) {
         task
-                .setCount(UserPreferenceHelper.getInstance().getRequestCountPerPage())
+                .setCount(200)
                 .onFail(x -> Notificator.getInstance().alert(R.string.notice_error_get_messages))
                 .onDoneUI(messages -> {
                     for (DirectMessage message : messages) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java
index 437d2047..6e0995c4 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java
@@ -46,7 +46,6 @@ import net.lacolaco.smileessence.data.SearchQuery;
 import net.lacolaco.smileessence.entity.Tweet;
 import net.lacolaco.smileessence.notification.Notificator;
 import net.lacolaco.smileessence.preference.InternalPreferenceHelper;
-import net.lacolaco.smileessence.preference.UserPreferenceHelper;
 import net.lacolaco.smileessence.twitter.task.SearchTask;
 import net.lacolaco.smileessence.util.SystemServiceHelper;
 import net.lacolaco.smileessence.util.UIHandler;
@@ -146,7 +145,7 @@ public class SearchFragment extends CustomListFragment<SearchListAdapter> implem
         }
         final Query query = new Query();
         query.setQuery(queryString);
-        query.setCount(UserPreferenceHelper.getInstance().getRequestCountPerPage());
+        query.setCount(200);
         query.setResultType(Query.RECENT);
         if (adapter.getCount() > 0) {
             query.setSinceId(adapter.getTopID());
@@ -172,7 +171,7 @@ public class SearchFragment extends CustomListFragment<SearchListAdapter> implem
         }
         final Query query = new Query();
         query.setQuery(queryString);
-        query.setCount(UserPreferenceHelper.getInstance().getRequestCountPerPage());
+        query.setCount(200);
         query.setResultType(Query.RECENT);
         if (adapter.getCount() > 0) {
             query.setMaxId(adapter.getLastID() - 1);
@@ -302,7 +301,7 @@ public class SearchFragment extends CustomListFragment<SearchListAdapter> implem
             adapter.updateForce();
             final Query query = new Query();
             query.setQuery(queryString);
-            query.setCount(UserPreferenceHelper.getInstance().getRequestCountPerPage());
+            query.setCount(200);
             query.setResultType(Query.RECENT);
             runRefreshTask(
                     new SearchTask(Application.getInstance().getCurrentAccount(), query),
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.java
index eb74bfda..86a98767 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.java
@@ -40,7 +40,6 @@ import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.entity.Tweet;
 import net.lacolaco.smileessence.notification.Notificator;
 import net.lacolaco.smileessence.preference.InternalPreferenceHelper;
-import net.lacolaco.smileessence.preference.UserPreferenceHelper;
 import net.lacolaco.smileessence.twitter.StatusFilter;
 import net.lacolaco.smileessence.twitter.task.TimelineTask;
 import net.lacolaco.smileessence.twitter.task.UserListStatusesTask;
@@ -198,7 +197,7 @@ public class UserListFragment extends CustomListFragment<UserListListAdapter> im
     private void runRefreshTask(TimelineTask<Tweet> task, Runnable onFinish) {
         final UserListListAdapter adapter = getAdapter();
         task
-                .setCount(UserPreferenceHelper.getInstance().getRequestCountPerPage())
+                .setCount(200)
                 .onFail(x -> Notificator.getInstance().alert(R.string.notice_error_get_list))
                 .onDoneUI(tweets -> {
                     for (Tweet tweet : tweets) {
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 183b0f71..f0b94fcc 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -30,7 +30,6 @@
     <string name="key_setting_notify_on_unfavorited">unfavNotify</string>
     <string name="key_setting_show_confirm_dialog">confirm</string>
     <string name="key_setting_read_morse">morse</string>
-    <string name="key_setting_timelines">requestCount</string>
     <string name="key_setting_theme">theme</string>
     <string name="key_setting_application_information">appInfo</string>
     <string name="key_setting_licenses">licenseNotice</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dc169bd8..9bba4a86 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -72,10 +72,6 @@
     <string name="setting_notify_on_unfavorited_title">On unfavorited</string>
     <string name="setting_notify_on_unfavorited_summary_on">Notify</string>
     <string name="setting_notify_on_unfavorited_summary_off">No Notice</string>
-    <string name="setting_timelines_title">The number of timeline getting</string>
-    <string name="setting_timelines_summary_format">Get new %s tweets by refresh</string>
-    <string name="setting_timelines_dialog_title">Edit number</string>
-    <string name="setting_timelines_dialog_message">Set a value between 1\-200</string>
     <string name="setting_category_about_title">About</string>
     <string name="setting_accounts_title">Manage accounts</string>
     <string name="setting_category_accounts_title">Accounts</string>
diff --git a/app/src/main/res/xml/setting.xml b/app/src/main/res/xml/setting.xml
index c7a2ee39..f3d000a0 100644
--- a/app/src/main/res/xml/setting.xml
+++ b/app/src/main/res/xml/setting.xml
@@ -73,14 +73,6 @@
             android:summaryOff="@string/setting_notify_on_unfavorited_summary_off"
             android:summaryOn="@string/setting_notify_on_unfavorited_summary_on"
             android:title="@string/setting_notify_on_unfavorited_title" />
-        <net.lacolaco.smileessence.view.preference.IntegerEditTextPreference
-            android:defaultValue="20"
-            android:dialogMessage="@string/setting_timelines_dialog_message"
-            android:dialogTitle="@string/setting_timelines_dialog_title"
-            android:key="@string/key_setting_timelines"
-            android:maxLength="3"
-            android:summary="@string/setting_timelines_summary_format"
-            android:title="@string/setting_timelines_title" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/setting_category_about_title">
         <Preference