From 43109bfcacad08e5684366f030a2b46dadafd8ae Mon Sep 17 00:00:00 2001 From: NudeDude Date: Thu, 28 Mar 2019 10:05:10 +0100 Subject: [PATCH] rearrange code --- .../twidda/backend/ProfileLoader.java | 21 ++++------ .../twidda/backend/StatusLoader.java | 41 +++++++++---------- 2 files changed, 29 insertions(+), 33 deletions(-) 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 9be74e1a..550aa544 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java @@ -36,8 +36,17 @@ import twitter4j.TwitterException; public class ProfileLoader extends AsyncTask { + public enum Mode { + LDR_PROFILE, + GET_TWEETS, + GET_FAVORS, + ACTION_FOLLOW, + ACTION_BLOCK, + ACTION_MUTE + } private final Mode mode; private boolean failure = false; + private TimelineAdapter homeTl, homeFav; private WeakReference ui; private SimpleDateFormat sdf; @@ -112,7 +121,6 @@ public class ProfileLoader extends AsyncTask { tweets = database.getUserTweets(UID); favors = database.getUserFavs(UID); } - user = mTwitter.getUser(UID); publishProgress(); database.storeUser(user); @@ -246,7 +254,6 @@ public class ProfileLoader extends AsyncTask { if (isFollowed) followback.setVisibility(View.VISIBLE); } - Spanned bio = Tagger.makeText(user.getBio(), highlight, ui.get()); txtBio.setMovementMethod(LinkMovementMethod.getInstance()); txtBio.setText(bio); @@ -410,14 +417,4 @@ public class ProfileLoader extends AsyncTask { } } } - - - public enum Mode { - LDR_PROFILE, - GET_TWEETS, - GET_FAVORS, - ACTION_FOLLOW, - ACTION_BLOCK, - ACTION_MUTE - } } \ No newline at end of file diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java index 9dba8d77..58e886e8 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java @@ -35,9 +35,29 @@ import static org.nuclearfog.twidda.window.TweetDetail.TWEET_REMOVED; public class StatusLoader extends AsyncTask { + public enum Mode { + LOAD, + ANS, + RETWEET, + FAVORITE, + DELETE + } private final Mode mode; private boolean failure = false; + private TwitterEngine mTwitter; + private TwitterException err; + private WeakReference ui; + private TimelineAdapter answerAdapter; + private DatabaseAdapter database; + private SimpleDateFormat sdf; + private NumberFormat formatter; + private List answers; + private Tweet tweet; + private int highlight, font_color; + private boolean toggleImg, toggleAns; + + public StatusLoader(@NonNull TweetDetail context, Mode mode) { mTwitter = TwitterEngine.getInstance(context); GlobalSettings settings = GlobalSettings.getInstance(context); @@ -56,18 +76,6 @@ public class StatusLoader extends AsyncTask { } - private TwitterEngine mTwitter; - private TwitterException err; - private WeakReference ui; - private TimelineAdapter answerAdapter; - private DatabaseAdapter database; - private SimpleDateFormat sdf; - private NumberFormat formatter; - private List answers; - private Tweet tweet; - private int highlight, font_color; - private boolean toggleImg, toggleAns; - @Override protected void onPreExecute() { if (ui.get() == null) return; @@ -253,15 +261,6 @@ public class StatusLoader extends AsyncTask { } - public enum Mode { - LOAD, - ANS, - RETWEET, - FAVORITE, - DELETE - } - - @Override protected void onCancelled() { if (ui.get() == null) return;