diff options
Diffstat (limited to 'app/src/main/java/net/lacolaco/smileessence/command/status')
5 files changed, 20 insertions, 46 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandCongratulate.java b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandCongratulate.java index c6fa6946..7e7cbabf 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandCongratulate.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandCongratulate.java @@ -26,8 +26,8 @@ package net.lacolaco.smileessence.command.status; import android.app.Activity; import net.lacolaco.smileessence.R; +import net.lacolaco.smileessence.activity.MainActivity; import net.lacolaco.smileessence.command.IConfirmable; -import net.lacolaco.smileessence.entity.Account; import net.lacolaco.smileessence.entity.Tweet; import net.lacolaco.smileessence.notification.NotificationType; import net.lacolaco.smileessence.notification.Notificator; @@ -40,15 +40,10 @@ import java.util.Random; public class StatusCommandCongratulate extends StatusCommand implements IConfirmable { - // ------------------------------ FIELDS ------------------------------ - - private final Account account; - // --------------------------- CONSTRUCTORS --------------------------- - public StatusCommandCongratulate(Activity activity, Tweet tweet, Account account) { + public StatusCommandCongratulate(Activity activity, Tweet tweet) { super(R.id.key_command_status_congratulate, activity, tweet); - this.account = account; } // --------------------- GETTER / SETTER METHODS --------------------- @@ -89,8 +84,8 @@ public class StatusCommandCongratulate extends StatusCommand implements IConfirm StatusUpdate update = new TweetBuilder().setText(build()) .setInReplyToStatusID(getOriginalStatus().getId()) .build(); - new TweetTask(account, update).execute(); - new FavoriteTask(account, getOriginalStatus().getId()) + new TweetTask(((MainActivity) getActivity()).getCurrentAccount(), update).execute(); + new FavoriteTask(((MainActivity) getActivity()).getCurrentAccount(), getOriginalStatus().getId()) .onDone(x -> Notificator.getInstance().publish(R.string.notice_favorite_succeeded)) .onFail(x -> Notificator.getInstance().publish(R.string.notice_favorite_failed, NotificationType.ALERT)) .execute(); diff --git a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandFavAndRT.java b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandFavAndRT.java index 9d5f5471..ec7c1bb3 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandFavAndRT.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandFavAndRT.java @@ -26,8 +26,8 @@ package net.lacolaco.smileessence.command.status; import android.app.Activity; import net.lacolaco.smileessence.R; +import net.lacolaco.smileessence.activity.MainActivity; import net.lacolaco.smileessence.command.IConfirmable; -import net.lacolaco.smileessence.entity.Account; import net.lacolaco.smileessence.entity.Tweet; import net.lacolaco.smileessence.entity.User; import net.lacolaco.smileessence.notification.NotificationType; @@ -38,15 +38,10 @@ import net.lacolaco.smileessence.twitter.task.RetweetTask; public class StatusCommandFavAndRT extends StatusCommand implements IConfirmable { - // ------------------------------ FIELDS ------------------------------ - - private final Account account; - // --------------------------- CONSTRUCTORS --------------------------- - public StatusCommandFavAndRT(Activity activity, Tweet tweet, Account account) { + public StatusCommandFavAndRT(Activity activity, Tweet tweet) { super(R.id.key_command_status_fav_and_rt, activity, tweet); - this.account = account; } // --------------------- GETTER / SETTER METHODS --------------------- @@ -59,18 +54,18 @@ public class StatusCommandFavAndRT extends StatusCommand implements IConfirmable @Override public boolean isEnabled() { User user = getOriginalStatus().getUser(); - return !user.isProtected() && user.getId() != account.getUserId(); + return !user.isProtected() && user != ((MainActivity) getActivity()).getCurrentAccount().getUser(); } // -------------------------- OTHER METHODS -------------------------- @Override public boolean execute() { - new FavoriteTask(account, getOriginalStatus().getId()) + new FavoriteTask(((MainActivity) getActivity()).getCurrentAccount(), getOriginalStatus().getId()) .onDone(x -> Notificator.getInstance().publish(R.string.notice_favorite_succeeded)) .onFail(x -> Notificator.getInstance().publish(R.string.notice_favorite_failed, NotificationType.ALERT)) .execute(); - new RetweetTask(account, getOriginalStatus().getId()) + new RetweetTask(((MainActivity) getActivity()).getCurrentAccount(), getOriginalStatus().getId()) .onDone(x -> Notificator.getInstance().publish(R.string.notice_retweet_succeeded)) .onFail(x -> Notificator.getInstance().publish(R.string.notice_retweet_failed, NotificationType.ALERT)) .execute(); diff --git a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandMakeAnonymous.java b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandMakeAnonymous.java index fa8cc5e0..a1e68855 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandMakeAnonymous.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandMakeAnonymous.java @@ -26,6 +26,7 @@ package net.lacolaco.smileessence.command.status; import android.app.Activity; import net.lacolaco.smileessence.R; +import net.lacolaco.smileessence.activity.MainActivity; import net.lacolaco.smileessence.command.IConfirmable; import net.lacolaco.smileessence.entity.Account; import net.lacolaco.smileessence.entity.Tweet; @@ -39,15 +40,10 @@ import twitter4j.StatusUpdate; public class StatusCommandMakeAnonymous extends StatusCommand implements IConfirmable { - // ------------------------------ FIELDS ------------------------------ - - private final Account account; - // -------------------------- STATIC METHODS -------------------------- - public StatusCommandMakeAnonymous(Activity activity, Tweet tweet, Account account) { + public StatusCommandMakeAnonymous(Activity activity, Tweet tweet) { super(R.id.key_command_status_make_anonymous, activity, tweet); - this.account = account; } // --------------------------- CONSTRUCTORS --------------------------- @@ -55,7 +51,6 @@ public class StatusCommandMakeAnonymous extends StatusCommand implements IConfir public static String build(Activity activity, Tweet tweet, Account account) { User user = account.getUser(); String str = tweet.getText(); - String header = ""; if (str.startsWith(".")) { str = str.replaceFirst(".", ""); } @@ -82,9 +77,9 @@ public class StatusCommandMakeAnonymous extends StatusCommand implements IConfir @Override public boolean execute() { - StatusUpdate update = new TweetBuilder().setText(build(getActivity(), getOriginalStatus(), account)).build(); - new TweetTask(account, update).execute(); - new FavoriteTask(account, getOriginalStatus().getId()) + StatusUpdate update = new TweetBuilder().setText(build(getActivity(), getOriginalStatus(), ((MainActivity) getActivity()).getCurrentAccount())).build(); + new TweetTask(((MainActivity) getActivity()).getCurrentAccount(), update).execute(); + new FavoriteTask(((MainActivity) getActivity()).getCurrentAccount(), getOriginalStatus().getId()) .onDone(x -> Notificator.getInstance().publish(R.string.notice_favorite_succeeded)) .onFail(x -> Notificator.getInstance().publish(R.string.notice_favorite_failed, NotificationType.ALERT)) .execute(); diff --git a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandNanigaja.java b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandNanigaja.java index f132db1e..1074b96f 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandNanigaja.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandNanigaja.java @@ -26,8 +26,8 @@ package net.lacolaco.smileessence.command.status; import android.app.Activity; import net.lacolaco.smileessence.R; +import net.lacolaco.smileessence.activity.MainActivity; import net.lacolaco.smileessence.command.IConfirmable; -import net.lacolaco.smileessence.entity.Account; import net.lacolaco.smileessence.entity.Tweet; import net.lacolaco.smileessence.entity.User; import net.lacolaco.smileessence.notification.NotificationType; @@ -39,15 +39,10 @@ import twitter4j.StatusUpdate; public class StatusCommandNanigaja extends StatusCommand implements IConfirmable { - // ------------------------------ FIELDS ------------------------------ - - private final Account account; - // --------------------------- CONSTRUCTORS --------------------------- - public StatusCommandNanigaja(Activity activity, Tweet tweet, Account account) { + public StatusCommandNanigaja(Activity activity, Tweet tweet) { super(R.id.key_command_status_nanigaja, activity, tweet); - this.account = account; } // --------------------- GETTER / SETTER METHODS --------------------- @@ -65,7 +60,7 @@ public class StatusCommandNanigaja extends StatusCommand implements IConfirmable // -------------------------- OTHER METHODS -------------------------- public String build() { - User user = account.getUser(); + User user = ((MainActivity) getActivity()).getCurrentAccount().getUser(); String str = getOriginalStatus().getText(); String header = ""; if (str.startsWith(".")) { @@ -84,8 +79,8 @@ public class StatusCommandNanigaja extends StatusCommand implements IConfirmable StatusUpdate update = new TweetBuilder().setText(build()) .setInReplyToStatusID(getOriginalStatus().getId()) .build(); - new TweetTask(account, update).execute(); - new FavoriteTask(account, getOriginalStatus().getId()) + new TweetTask(((MainActivity) getActivity()).getCurrentAccount(), update).execute(); + new FavoriteTask(((MainActivity) getActivity()).getCurrentAccount(), getOriginalStatus().getId()) .onDone(x -> Notificator.getInstance().publish(R.string.notice_favorite_succeeded)) .onFail(x -> Notificator.getInstance().publish(R.string.notice_favorite_failed, NotificationType.ALERT)) .execute(); diff --git a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandOpenTalkView.java b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandOpenTalkView.java index bb826412..54c6c69a 100644 --- a/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandOpenTalkView.java +++ b/app/src/main/java/net/lacolaco/smileessence/command/status/StatusCommandOpenTalkView.java @@ -26,22 +26,16 @@ package net.lacolaco.smileessence.command.status; import android.app.Activity; import net.lacolaco.smileessence.R; -import net.lacolaco.smileessence.entity.Account; import net.lacolaco.smileessence.entity.Tweet; import net.lacolaco.smileessence.view.DialogHelper; import net.lacolaco.smileessence.view.dialog.TalkChainDialogFragment; public class StatusCommandOpenTalkView extends StatusCommand { - // ------------------------------ FIELDS ------------------------------ - - private final Account account; - // --------------------------- CONSTRUCTORS --------------------------- - public StatusCommandOpenTalkView(Activity activity, Tweet tweet, Account account) { + public StatusCommandOpenTalkView(Activity activity, Tweet tweet) { super(R.id.key_command_status_open_chain, activity, tweet); - this.account = account; } // --------------------- GETTER / SETTER METHODS --------------------- |