From 187b8f43954fc201428d6d726c81e101e22d0abe Mon Sep 17 00:00:00 2001 From: NudeDude Date: Tue, 25 Dec 2018 12:58:01 +0100 Subject: [PATCH] code reformat --- .../nuclearfog/twidda/backend/MainPage.java | 92 +++++++++++-------- .../twidda/backend/ProfileLoader.java | 9 +- 2 files changed, 58 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java b/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java index 86f81a8b..2bdb4d4c 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java @@ -70,29 +70,36 @@ public class MainPage extends AsyncTask { final int PAGE = args[1]; long sinceId = 1L; try { - if (MODE == HOME) { - if (timelineAdapter.getItemCount() > 0) - sinceId = timelineAdapter.getItemId(0); - tweets = mTwitter.getHome(PAGE, sinceId); - publishProgress(HOME); - tweetDb.storeHomeTimeline(tweets); - } else if (MODE == TRND) { - trends = mTwitter.getTrends(woeId); - publishProgress(TRND); - tweetDb.storeTrends(trends, woeId); - } else if (MODE == MENT) { - if (mentionAdapter.getItemCount() != 0) - sinceId = mentionAdapter.getItemId(0); - mention = mTwitter.getMention(PAGE, sinceId); - publishProgress(MENT); - tweetDb.storeMentions(mention); - } else { - tweets = tweetDb.getHomeTimeline(); - publishProgress(HOME); - trends = tweetDb.getTrends(woeId); - publishProgress(TRND); - mention = tweetDb.getMentions(); - publishProgress(MENT); + switch (MODE) { + case HOME: + if (timelineAdapter.getItemCount() > 0) + sinceId = timelineAdapter.getItemId(0); + tweets = mTwitter.getHome(PAGE, sinceId); + publishProgress(HOME); + tweetDb.storeHomeTimeline(tweets); + break; + + case TRND: + trends = mTwitter.getTrends(woeId); + publishProgress(TRND); + tweetDb.storeTrends(trends, woeId); + break; + + case MENT: + if (mentionAdapter.getItemCount() != 0) + sinceId = mentionAdapter.getItemId(0); + mention = mTwitter.getMention(PAGE, sinceId); + publishProgress(MENT); + tweetDb.storeMentions(mention); + break; + + default: + tweets = tweetDb.getHomeTimeline(); + publishProgress(HOME); + trends = tweetDb.getTrends(woeId); + publishProgress(TRND); + mention = tweetDb.getMentions(); + publishProgress(MENT); } } catch (TwitterException e) { returnCode = e.getErrorCode(); @@ -113,21 +120,28 @@ public class MainPage extends AsyncTask { if (ui.get() == null) return; final int MODE = modes[0]; - if (MODE == HOME) { - timelineAdapter.setData(tweets); - timelineAdapter.notifyDataSetChanged(); - SwipeRefreshLayout timelineRefresh = ui.get().findViewById(R.id.timeline); - timelineRefresh.setRefreshing(false); - } else if (MODE == TRND) { - trendsAdapter.setData(trends); - trendsAdapter.notifyDataSetChanged(); - SwipeRefreshLayout trendRefresh = ui.get().findViewById(R.id.trends); - trendRefresh.setRefreshing(false); - } else if (MODE == MENT) { - mentionAdapter.setData(mention); - mentionAdapter.notifyDataSetChanged(); - SwipeRefreshLayout mentionRefresh = ui.get().findViewById(R.id.mention); - mentionRefresh.setRefreshing(false); + + switch (MODE) { + case HOME: + timelineAdapter.setData(tweets); + timelineAdapter.notifyDataSetChanged(); + SwipeRefreshLayout timelineRefresh = ui.get().findViewById(R.id.timeline); + timelineRefresh.setRefreshing(false); + break; + + case TRND: + trendsAdapter.setData(trends); + trendsAdapter.notifyDataSetChanged(); + SwipeRefreshLayout trendRefresh = ui.get().findViewById(R.id.trends); + trendRefresh.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 { case 420: Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_SHORT).show(); break; + case -1: Toast.makeText(ui.get(), R.string.error_not_specified, Toast.LENGTH_SHORT).show(); break; + default: Toast.makeText(ui.get(), errMsg, Toast.LENGTH_LONG).show(); } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java index 018a2b58..138702fa 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java @@ -36,15 +36,14 @@ import twitter4j.TwitterException; public class ProfileLoader extends AsyncTask { - public static final long GET_TWEETS = 2; - public static final long GET_FAVORS = 3; + public static final long GET_TWEETS = 1; + public static final long GET_FAVORS = 2; // 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_MUTE = 5; - // GET USER TWEETS - private static final long GET_USER = 1; // INTERN FLAGS + private static final long GET_USER = 6; private static final long FAILURE = -1; private TimelineAdapter homeTl, homeFav;