MainActivity 以外は Account 自体を保持してはいけない

17 files changed, 59 insertions, 131 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserDetail.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserDetail.java
index 303ff271..4e9f9a85 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserDetail.java
+++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenUserDetail.java
@@ -26,6 +26,7 @@ package net.lacolaco.smileessence.command;
 
 import android.app.Activity;
 import net.lacolaco.smileessence.R;
+import net.lacolaco.smileessence.activity.MainActivity;
 import net.lacolaco.smileessence.entity.Account;
 import net.lacolaco.smileessence.notification.NotificationType;
 import net.lacolaco.smileessence.notification.Notificator;
@@ -38,14 +39,12 @@ public class CommandOpenUserDetail extends Command {
     // ------------------------------ FIELDS ------------------------------
 
     private final String screenName;
-    private final Account account;
 
     // --------------------------- CONSTRUCTORS ---------------------------
 
     public CommandOpenUserDetail(Activity activity, String screenName, Account account) {
         super(-1, activity);
         this.screenName = screenName;
-        this.account = account;
     }
 
     // --------------------- GETTER / SETTER METHODS ---------------------
@@ -64,7 +63,7 @@ public class CommandOpenUserDetail extends Command {
 
     @Override
     public boolean execute() {
-        new ShowUserTask(account, screenName)
+        new ShowUserTask(((MainActivity) getActivity()).getCurrentAccount(), screenName)
                 .onDoneUI(user -> {
                     UserDetailDialogFragment fragment = new UserDetailDialogFragment();
                     fragment.setUserID(user.getId());
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 ---------------------
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandBlock.java b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandBlock.java
index 793eb610..02d21716 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandBlock.java
+++ b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandBlock.java
@@ -26,8 +26,8 @@ package net.lacolaco.smileessence.command.user;
 
 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.User;
 import net.lacolaco.smileessence.notification.NotificationType;
 import net.lacolaco.smileessence.notification.Notificator;
@@ -35,15 +35,10 @@ import net.lacolaco.smileessence.twitter.task.BlockTask;
 
 public class UserCommandBlock extends UserCommand implements IConfirmable {
 
-    // ------------------------------ FIELDS ------------------------------
-
-    private final Account account;
-
     // --------------------------- CONSTRUCTORS ---------------------------
 
-    public UserCommandBlock(Activity activity, User user, Account account) {
+    public UserCommandBlock(Activity activity, User user) {
         super(R.id.key_command_user_block, activity, user);
-        this.account = account;
     }
 
     // --------------------- GETTER / SETTER METHODS ---------------------
@@ -55,14 +50,14 @@ public class UserCommandBlock extends UserCommand implements IConfirmable {
 
     @Override
     public boolean isEnabled() {
-        return getUser().getId() != account.getUserId();
+        return getUser() != ((MainActivity) getActivity()).getCurrentAccount().getUser();
     }
 
     // -------------------------- OTHER METHODS --------------------------
 
     @Override
     public boolean execute() {
-        new BlockTask(account, getUser().getId())
+        new BlockTask(((MainActivity) getActivity()).getCurrentAccount(), getUser().getId())
                 .onDone(user -> Notificator.getInstance().publish(R.string.notice_block_succeeded))
                 .onFail(ex -> Notificator.getInstance().publish(R.string.notice_block_failed, NotificationType.ALERT))
                 .execute();
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandReportForSpam.java b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandReportForSpam.java
index 5b185dbc..84be2561 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandReportForSpam.java
+++ b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandReportForSpam.java
@@ -26,8 +26,8 @@ package net.lacolaco.smileessence.command.user;
 
 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.User;
 import net.lacolaco.smileessence.notification.NotificationType;
 import net.lacolaco.smileessence.notification.Notificator;
@@ -35,15 +35,10 @@ import net.lacolaco.smileessence.twitter.task.ReportForSpamTask;
 
 public class UserCommandReportForSpam extends UserCommand implements IConfirmable {
 
-    // ------------------------------ FIELDS ------------------------------
-
-    private final Account account;
-
     // --------------------------- CONSTRUCTORS ---------------------------
 
-    public UserCommandReportForSpam(Activity activity, User user, Account account) {
+    public UserCommandReportForSpam(Activity activity, User user) {
         super(R.id.key_command_user_r4s, activity, user);
-        this.account = account;
     }
 
     // --------------------- GETTER / SETTER METHODS ---------------------
@@ -55,14 +50,14 @@ public class UserCommandReportForSpam extends UserCommand implements IConfirmabl
 
     @Override
     public boolean isEnabled() {
-        return getUser().getId() != account.getUserId();
+        return getUser() != ((MainActivity) getActivity()).getCurrentAccount().getUser();
     }
 
     // -------------------------- OTHER METHODS --------------------------
 
     @Override
     public boolean execute() {
-        new ReportForSpamTask(account, getUser().getId())
+        new ReportForSpamTask(((MainActivity) getActivity()).getCurrentAccount(), getUser().getId())
                 .onDone(user -> Notificator.getInstance().publish(R.string.notice_r4s_succeeded))
                 .onFail(ex -> Notificator.getInstance().publish(R.string.notice_r4s_failed, NotificationType.ALERT))
                 .execute();
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandSendMessage.java b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandSendMessage.java
index 3b60f54e..f0da18a5 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandSendMessage.java
+++ b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandSendMessage.java
@@ -26,22 +26,17 @@ package net.lacolaco.smileessence.command.user;
 
 import android.app.Activity;
 import net.lacolaco.smileessence.R;
-import net.lacolaco.smileessence.entity.Account;
+import net.lacolaco.smileessence.activity.MainActivity;
 import net.lacolaco.smileessence.entity.User;
 import net.lacolaco.smileessence.view.DialogHelper;
 import net.lacolaco.smileessence.view.dialog.SendMessageDialogFragment;
 
 public class UserCommandSendMessage extends UserCommand {
 
-    // ------------------------------ FIELDS ------------------------------
-
-    private final Account account;
-
     // --------------------------- CONSTRUCTORS ---------------------------
 
-    public UserCommandSendMessage(Activity activity, User user, Account account) {
+    public UserCommandSendMessage(Activity activity, User user) {
         super(R.id.key_command_user_send_message, activity, user);
-        this.account = account;
     }
 
     // --------------------- GETTER / SETTER METHODS ---------------------
@@ -53,7 +48,7 @@ public class UserCommandSendMessage extends UserCommand {
 
     @Override
     public boolean isEnabled() {
-        return account.getUserId() != getUser().getId();
+        return getUser() != ((MainActivity) getActivity()).getCurrentAccount().getUser();
     }
 
     // -------------------------- OTHER METHODS --------------------------
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandUnblock.java b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandUnblock.java
index 524bc39e..ecea1d55 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandUnblock.java
+++ b/app/src/main/java/net/lacolaco/smileessence/command/user/UserCommandUnblock.java
@@ -26,8 +26,8 @@ package net.lacolaco.smileessence.command.user;
 
 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.User;
 import net.lacolaco.smileessence.notification.NotificationType;
 import net.lacolaco.smileessence.notification.Notificator;
@@ -35,15 +35,10 @@ import net.lacolaco.smileessence.twitter.task.UnblockTask;
 
 public class UserCommandUnblock extends UserCommand implements IConfirmable {
 
-    // ------------------------------ FIELDS ------------------------------
-
-    private final Account account;
-
     // --------------------------- CONSTRUCTORS ---------------------------
 
-    public UserCommandUnblock(Activity activity, User user, Account account) {
+    public UserCommandUnblock(Activity activity, User user) {
         super(R.id.key_command_user_unblock, activity, user);
-        this.account = account;
     }
 
     // --------------------- GETTER / SETTER METHODS ---------------------
@@ -55,14 +50,14 @@ public class UserCommandUnblock extends UserCommand implements IConfirmable {
 
     @Override
     public boolean isEnabled() {
-        return getUser().getId() != account.getUserId();
+        return getUser() != ((MainActivity) getActivity()).getCurrentAccount().getUser();
     }
 
     // -------------------------- OTHER METHODS --------------------------
 
     @Override
     public boolean execute() {
-        new UnblockTask(account, getUser().getId())
+        new UnblockTask(((MainActivity) getActivity()).getCurrentAccount(), getUser().getId())
                 .onDone(user -> Notificator.getInstance().publish(R.string.notice_unblock_succeeded))
                 .onFail(x -> Notificator.getInstance().publish(R.string.notice_unblock_failed, NotificationType.ALERT))
                 .execute();
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/ConfirmDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/ConfirmDialogFragment.java
index 3ff84013..5b975dbb 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/ConfirmDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/ConfirmDialogFragment.java
@@ -38,12 +38,9 @@ public abstract class ConfirmDialogFragment extends StackableDialogFragment {
     // ------------------------------ FIELDS ------------------------------
 
     public static final String ARG_TEXT = "text";
-    private final DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            onButtonClick(which);
-            dialog.dismiss();
-        }
+    private final DialogInterface.OnClickListener listener = (dialog, which) -> {
+        onButtonClick(which);
+        dialog.dismiss();
     };
     private String text;
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/EditTextDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/EditTextDialogFragment.java
index f801a0d8..ae77bd73 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/EditTextDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/EditTextDialogFragment.java
@@ -26,7 +26,6 @@ package net.lacolaco.smileessence.view.dialog;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
@@ -59,18 +58,12 @@ public abstract class EditTextDialogFragment extends StackableDialogFragment {
         return new AlertDialog.Builder(getActivity())
                 .setTitle(title)
                 .setView(view)
-                .setPositiveButton(R.string.alert_dialog_ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        onTextInput(editText.getText().toString());
-                        dialog.dismiss();
-                    }
+                .setPositiveButton(R.string.alert_dialog_ok, (dialog, which) -> {
+                    onTextInput(editText.getText().toString());
+                    dialog.dismiss();
                 })
-                .setNegativeButton(R.string.alert_dialog_cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        dialog.dismiss();
-                    }
+                .setNegativeButton(R.string.alert_dialog_cancel, (dialog, which) -> {
+                    dialog.dismiss();
                 })
                 .create();
     }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/HashtagDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/HashtagDialogFragment.java
index d947758e..9f679879 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/HashtagDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/HashtagDialogFragment.java
@@ -46,7 +46,7 @@ public class HashtagDialogFragment extends MenuDialogFragment {
     // --------------------- GETTER / SETTER METHODS ---------------------
 
     private String getHashtagText() {
-        return "#" + (String) getArguments().get(KEY_TEXT);
+        return "#" + getArguments().get(KEY_TEXT);
     }
 
     public void setText(String text) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MenuDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MenuDialogFragment.java
index 2a72579d..d53f89c5 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MenuDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MenuDialogFragment.java
@@ -53,12 +53,7 @@ public abstract class MenuDialogFragment extends StackableDialogFragment {
 
     protected abstract void setMenuItems(final CustomListAdapter<Command> adapter);
 
-    protected final AdapterView.OnItemClickListener onItemClickListener = new AdapterView.OnItemClickListener() {
-        @Override
-        public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-            MenuDialogFragment.this.onItemClick(adapterView, i);
-        }
-    };
+    protected final AdapterView.OnItemClickListener onItemClickListener = (adapterView, view, i, l) -> MenuDialogFragment.this.onItemClick(adapterView, i);
 
     protected void executeCommand(Command command) {
         dismiss();
@@ -69,12 +64,7 @@ public abstract class MenuDialogFragment extends StackableDialogFragment {
         final Command command = (Command) adapterView.getItemAtPosition(i);
         if (command != null) {
             if (command instanceof IConfirmable) {
-                ConfirmDialogFragment.show(getActivity(), getString(R.string.dialog_confirm_commands), new Runnable() {
-                    @Override
-                    public void run() {
-                        executeCommand(command);
-                    }
-                });
+                ConfirmDialogFragment.show(getActivity(), getString(R.string.dialog_confirm_commands), () -> executeCommand(command));
             } else {
                 executeCommand(command);
             }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java
index 80e32670..8c459cbc 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java
@@ -77,8 +77,8 @@ public class StatusDetailDialogFragment extends StackableDialogFragment implemen
 
     @Override
     public void onClick(final View v) {
-        final MainActivity activity = (MainActivity) getActivity();
-        final Account account = activity.getCurrentAccount();
+        MainActivity activity = (MainActivity) getActivity();
+        Account account = activity.getCurrentAccount();
 
         switch (v.getId()) {
             case R.id.button_status_detail_reply: {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/TalkChainDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/TalkChainDialogFragment.java
index 4c3a7daf..5d4d7654 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/TalkChainDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/TalkChainDialogFragment.java
@@ -59,7 +59,7 @@ public class TalkChainDialogFragment extends StackableDialogFragment {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         MainActivity activity = (MainActivity) getActivity();
-        final Account account = activity.getCurrentAccount();
+        Account account = activity.getCurrentAccount();
 
         View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_talk_list, null);
         ListView listView = (ListView) view.findViewById(R.id.listview_dialog_talk_list);
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 96bebe91..6cb0393d 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
@@ -105,8 +105,8 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
 
     @Override
     public void onClick(final View v) {
-        final MainActivity activity = (MainActivity) getActivity();
-        final Account account = activity.getCurrentAccount();
+        MainActivity activity = (MainActivity) getActivity();
+        Account account = activity.getCurrentAccount();
         User user = User.fetch(getUserID());
         if (user != null) {
             switch (v.getId()) {
@@ -139,12 +139,7 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
                     break;
                 }
                 case R.id.button_user_detail_follow: {
-                    ConfirmDialogFragment.show(activity, getString(R.string.dialog_confirm_commands), new Runnable() {
-                        @Override
-                        public void run() {
-                            toggleFollowing(user, account, activity);
-                        }
-                    });
+                    ConfirmDialogFragment.show(activity, getString(R.string.dialog_confirm_commands), () -> toggleFollowing(user, account, activity));
                     break;
                 }
             }
@@ -157,8 +152,8 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
 
     @Override
     public void onPullDownToRefresh(final PullToRefreshBase<ListView> refreshView) {
-        final MainActivity activity = (MainActivity) getActivity();
-        final Account currentAccount = activity.getCurrentAccount();
+        MainActivity activity = (MainActivity) getActivity();
+        Account currentAccount = activity.getCurrentAccount();
         new UserTimelineTask(currentAccount, getUserID())
                 .setCount(((MainActivity) getActivity()).getRequestCountPerPage())
                 .setSinceId(adapter.getTopID())
@@ -175,8 +170,8 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
 
     @Override
     public void onPullUpToRefresh(final PullToRefreshBase<ListView> refreshView) {
-        final MainActivity activity = (MainActivity) getActivity();
-        final Account currentAccount = activity.getCurrentAccount();
+        MainActivity activity = (MainActivity) getActivity();
+        Account currentAccount = activity.getCurrentAccount();
         new UserTimelineTask(currentAccount, getUserID())
                 .setCount(((MainActivity) getActivity()).getRequestCountPerPage())
                 .setMaxId(adapter.getLastID() - 1)
@@ -196,7 +191,7 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         MainActivity activity = (MainActivity) getActivity();
-        final Account account = activity.getCurrentAccount();
+        Account account = activity.getCurrentAccount();
         User user = User.fetch(getUserID());
         if (user == null) {
             return new DisposeDialog(activity);