code reformat

This commit is contained in:
NudeDude 2018-12-25 12:58:01 +01:00
parent ba0fe4cfc9
commit 187b8f4395
2 changed files with 58 additions and 43 deletions

View File

@ -70,29 +70,36 @@ public class MainPage extends AsyncTask<Integer, Integer, Integer> {
final int PAGE = args[1]; final int PAGE = args[1];
long sinceId = 1L; long sinceId = 1L;
try { try {
if (MODE == HOME) { switch (MODE) {
if (timelineAdapter.getItemCount() > 0) case HOME:
sinceId = timelineAdapter.getItemId(0); if (timelineAdapter.getItemCount() > 0)
tweets = mTwitter.getHome(PAGE, sinceId); sinceId = timelineAdapter.getItemId(0);
publishProgress(HOME); tweets = mTwitter.getHome(PAGE, sinceId);
tweetDb.storeHomeTimeline(tweets); publishProgress(HOME);
} else if (MODE == TRND) { tweetDb.storeHomeTimeline(tweets);
trends = mTwitter.getTrends(woeId); break;
publishProgress(TRND);
tweetDb.storeTrends(trends, woeId); case TRND:
} else if (MODE == MENT) { trends = mTwitter.getTrends(woeId);
if (mentionAdapter.getItemCount() != 0) publishProgress(TRND);
sinceId = mentionAdapter.getItemId(0); tweetDb.storeTrends(trends, woeId);
mention = mTwitter.getMention(PAGE, sinceId); break;
publishProgress(MENT);
tweetDb.storeMentions(mention); case MENT:
} else { if (mentionAdapter.getItemCount() != 0)
tweets = tweetDb.getHomeTimeline(); sinceId = mentionAdapter.getItemId(0);
publishProgress(HOME); mention = mTwitter.getMention(PAGE, sinceId);
trends = tweetDb.getTrends(woeId); publishProgress(MENT);
publishProgress(TRND); tweetDb.storeMentions(mention);
mention = tweetDb.getMentions(); break;
publishProgress(MENT);
default:
tweets = tweetDb.getHomeTimeline();
publishProgress(HOME);
trends = tweetDb.getTrends(woeId);
publishProgress(TRND);
mention = tweetDb.getMentions();
publishProgress(MENT);
} }
} catch (TwitterException e) { } catch (TwitterException e) {
returnCode = e.getErrorCode(); returnCode = e.getErrorCode();
@ -113,21 +120,28 @@ public class MainPage extends AsyncTask<Integer, Integer, Integer> {
if (ui.get() == null) return; if (ui.get() == null) return;
final int MODE = modes[0]; final int MODE = modes[0];
if (MODE == HOME) {
timelineAdapter.setData(tweets); switch (MODE) {
timelineAdapter.notifyDataSetChanged(); case HOME:
SwipeRefreshLayout timelineRefresh = ui.get().findViewById(R.id.timeline); timelineAdapter.setData(tweets);
timelineRefresh.setRefreshing(false); timelineAdapter.notifyDataSetChanged();
} else if (MODE == TRND) { SwipeRefreshLayout timelineRefresh = ui.get().findViewById(R.id.timeline);
trendsAdapter.setData(trends); timelineRefresh.setRefreshing(false);
trendsAdapter.notifyDataSetChanged(); break;
SwipeRefreshLayout trendRefresh = ui.get().findViewById(R.id.trends);
trendRefresh.setRefreshing(false); case TRND:
} else if (MODE == MENT) { trendsAdapter.setData(trends);
mentionAdapter.setData(mention); trendsAdapter.notifyDataSetChanged();
mentionAdapter.notifyDataSetChanged(); SwipeRefreshLayout trendRefresh = ui.get().findViewById(R.id.trends);
SwipeRefreshLayout mentionRefresh = ui.get().findViewById(R.id.mention); trendRefresh.setRefreshing(false);
mentionRefresh.setRefreshing(false); break;
case MENT:
mentionAdapter.setData(mention);
mentionAdapter.notifyDataSetChanged();
SwipeRefreshLayout mentionRefresh = ui.get().findViewById(R.id.mention);
mentionRefresh.setRefreshing(false);
break;
} }
} }
@ -149,9 +163,11 @@ public class MainPage extends AsyncTask<Integer, Integer, Integer> {
case 420: case 420:
Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_SHORT).show(); Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_SHORT).show();
break; break;
case -1: case -1:
Toast.makeText(ui.get(), R.string.error_not_specified, Toast.LENGTH_SHORT).show(); Toast.makeText(ui.get(), R.string.error_not_specified, Toast.LENGTH_SHORT).show();
break; break;
default: default:
Toast.makeText(ui.get(), errMsg, Toast.LENGTH_LONG).show(); Toast.makeText(ui.get(), errMsg, Toast.LENGTH_LONG).show();
} }

View File

@ -36,15 +36,14 @@ import twitter4j.TwitterException;
public class ProfileLoader extends AsyncTask<Long, Long, Long> { public class ProfileLoader extends AsyncTask<Long, Long, Long> {
public static final long GET_TWEETS = 2; public static final long GET_TWEETS = 1;
public static final long GET_FAVORS = 3; public static final long GET_FAVORS = 2;
// USER ACTION // USER ACTION
public static final long ACTION_FOLLOW = 6; public static final long ACTION_FOLLOW = 3;
public static final long ACTION_BLOCK = 4; public static final long ACTION_BLOCK = 4;
public static final long ACTION_MUTE = 5; public static final long ACTION_MUTE = 5;
// GET USER TWEETS
private static final long GET_USER = 1;
// INTERN FLAGS // INTERN FLAGS
private static final long GET_USER = 6;
private static final long FAILURE = -1; private static final long FAILURE = -1;
private TimelineAdapter homeTl, homeFav; private TimelineAdapter homeTl, homeFav;