UIHandler をもっと素直に

16 files changed, 38 insertions, 80 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/IntentRouter.java b/app/src/main/java/net/lacolaco/smileessence/IntentRouter.java
index 2c2096a6..e374305f 100644
--- a/app/src/main/java/net/lacolaco/smileessence/IntentRouter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/IntentRouter.java
@@ -143,10 +143,10 @@ public class IntentRouter {
     }
 
     private static void openPostPage(final MainActivity activity, final String str) {
-        new UIHandler(() -> PostState.newState().beginTransaction().setText(str).commitWithOpen(activity)).post();
+        new UIHandler().post(() -> PostState.newState().beginTransaction().setText(str).commitWithOpen(activity));
     }
 
     private static void openPostPageWithImage(final MainActivity activity, final Uri imageUri) {
-        new UIHandler(() -> activity.openPostPageWithImage(imageUri)).post();
+        new UIHandler().post(() -> activity.openPostPageWithImage(imageUri));
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
index 80299528..a4e904dd 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
@@ -324,7 +324,7 @@ public class MainActivity extends Activity {
     }
 
     public void setSelectedPageIndex(final int position, final boolean smooth) {
-        new UIHandler(() -> viewPager.setCurrentItem(position, smooth)).post();
+        new UIHandler().post(() -> viewPager.setCurrentItem(position, smooth));
     }
 
     public void startMainLogic() {
diff --git a/app/src/main/java/net/lacolaco/smileessence/notification/Notificator.java b/app/src/main/java/net/lacolaco/smileessence/notification/Notificator.java
index 965d4a03..12c49fd8 100644
--- a/app/src/main/java/net/lacolaco/smileessence/notification/Notificator.java
+++ b/app/src/main/java/net/lacolaco/smileessence/notification/Notificator.java
@@ -71,7 +71,7 @@ public class Notificator {
         if (activity.isFinishing()) {
             return;
         }
-        new UIHandler(() -> {
+        new UIHandler().post(() -> {
             if (isForeground) {
                 Logger.debug(String.format("notify by crouton %s", text));
                 Crouton.makeText(activity, text, getStyle(type)).show();
@@ -79,7 +79,7 @@ public class Notificator {
                 Logger.debug(String.format("notify by toast %s", text));
                 Toast.makeText(activity, text, Toast.LENGTH_LONG).show();
             }
-        }).post();
+        });
     }
 
     public void onForeground() {
diff --git a/app/src/main/java/net/lacolaco/smileessence/util/UIHandler.java b/app/src/main/java/net/lacolaco/smileessence/util/UIHandler.java
index 3171184e..b1742c05 100644
--- a/app/src/main/java/net/lacolaco/smileessence/util/UIHandler.java
+++ b/app/src/main/java/net/lacolaco/smileessence/util/UIHandler.java
@@ -27,36 +27,10 @@ package net.lacolaco.smileessence.util;
 import android.os.Handler;
 import android.os.Looper;
 
-public class UIHandler {
-    private final Runnable runnable;
-    private final Handler handler;
-
+public class UIHandler extends Handler {
     // --------------------------- CONSTRUCTORS ---------------------------
 
-    public UIHandler(Runnable _runnable) {
-        handler = new Handler(Looper.getMainLooper());
-        runnable = _runnable;
-    }
-
-    // -------------------------- OTHER METHODS --------------------------
-
-    public boolean post() {
-        return handler.post(runnable);
-    }
-
-    public boolean postAtFrontOfQueue() {
-        return handler.postAtFrontOfQueue(runnable);
-    }
-
-    public boolean postAtTime(long uptimeMillis) {
-        return handler.postAtTime(runnable, uptimeMillis);
-    }
-
-    public boolean postAtTime(Object token, long uptimeMillis) {
-        return handler.postAtTime(runnable, token, uptimeMillis);
-    }
-
-    public boolean postDelayed(long delayMillis) {
-        return handler.postDelayed(runnable, delayMillis);
+    public UIHandler() {
+        super(Looper.getMainLooper());
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/DialogHelper.java b/app/src/main/java/net/lacolaco/smileessence/view/DialogHelper.java
index f920ecaa..6f8af2f5 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/DialogHelper.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/DialogHelper.java
@@ -35,7 +35,7 @@ public class DialogHelper {
     private static LinkedHashSet<String> dialogStack = new LinkedHashSet<>();
 
     public static void closeAllDialogs(Activity activity) {
-        for (String tag : new LinkedHashSet<String>(dialogStack)) {
+        for (String tag : new LinkedHashSet<>(dialogStack)) {
             StackableDialogFragment dialog = (StackableDialogFragment) activity.getFragmentManager().findFragmentByTag(tag);
             if (dialog != null) {
                 dialog.dismiss();
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/HomeFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/HomeFragment.java
index 45159f81..e1291a8d 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/HomeFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/HomeFragment.java
@@ -90,10 +90,10 @@ public class HomeFragment extends CustomListFragment<StatusListAdapter> {
         final MainActivity activity = (MainActivity) getActivity();
         final StatusListAdapter adapter = getAdapter();
         if (activity.isStreaming()) {
-            new UIHandler(() -> {
+            new UIHandler().post(() -> {
                 updateListViewWithNotice(refreshView.getRefreshableView(), true);
                 refreshView.onRefreshComplete();
-            }).post();
+            });
             return;
         }
         final Account currentAccount = activity.getCurrentAccount();
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java
index 30266289..7826f457 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java
@@ -132,7 +132,7 @@ public class PostFragment extends PageFragment implements TextWatcher, View.OnFo
             editText.setTextKeepState(postState.getText());
             editText.addTextChangedListener(this);
             updateTextCount(editText.getText());
-            new UIHandler(() -> editText.setSelection(start, end)).postAtFrontOfQueue();
+            new UIHandler().postAtFrontOfQueue(() -> editText.setSelection(start, end));
         }
         if (viewGroupReply != null) {
             if (postState.getInReplyToStatusID() >= 0) {
@@ -354,10 +354,10 @@ public class PostFragment extends PageFragment implements TextWatcher, View.OnFo
 
     private void showIME() {
         if (editText != null) {
-            new UIHandler(() -> {
+            new UIHandler().postDelayed(() -> {
                 InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
                 imm.showSoftInput(editText, InputMethodManager.RESULT_UNCHANGED_SHOWN);
-            }).postDelayed(100);
+            }, 100);
         }
     }
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java
index 4af11217..edcb0a07 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java
@@ -140,10 +140,10 @@ public class SearchFragment extends CustomListFragment<SearchListAdapter> implem
         final SearchListAdapter adapter = getAdapter();
         String queryString = adapter.getQuery();
         if (TextUtils.isEmpty(queryString)) {
-            new UIHandler(() -> {
+            new UIHandler().post(() -> {
                 notifyTextEmpty(activity);
                 refreshView.onRefreshComplete();
-            }).post();
+            });
             return;
         }
         final Query query = new Query();
@@ -183,10 +183,10 @@ public class SearchFragment extends CustomListFragment<SearchListAdapter> implem
         final SearchListAdapter adapter = getAdapter();
         String queryString = adapter.getQuery();
         if (TextUtils.isEmpty(queryString)) {
-            new UIHandler(() -> {
+            new UIHandler().post(() -> {
                 notifyTextEmpty(activity);
                 refreshView.onRefreshComplete();
-            }).post();
+            });
             return;
         }
         final Query query = new Query();
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/UserListFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/UserListFragment.java
index 7cb7cd6e..da2c89ea 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/UserListFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/UserListFragment.java
@@ -109,10 +109,10 @@ public class UserListFragment extends CustomListFragment<UserListListAdapter> im
         final UserListListAdapter adapter = (UserListListAdapter) getAdapter();
         String listFullName = adapter.getListFullName();
         if (TextUtils.isEmpty(listFullName)) {
-            new UIHandler(() -> {
+            new UIHandler().post(() -> {
                 notifyTextEmpty(activity);
                 refreshView.onRefreshComplete();
-            }).post();
+            });
             return;
         }
         Paging paging = TwitterUtils.getPaging(activity.getRequestCountPerPage());
@@ -139,13 +139,13 @@ public class UserListFragment extends CustomListFragment<UserListListAdapter> im
         final MainActivity activity = getMainActivity();
         final Account currentAccount = activity.getCurrentAccount();
         Twitter twitter = currentAccount.getTwitter();
-        final UserListListAdapter adapter = (UserListListAdapter) getAdapter();
+        final UserListListAdapter adapter = getAdapter();
         String listFullName = adapter.getListFullName();
         if (TextUtils.isEmpty(listFullName)) {
-            new UIHandler(() -> {
+            new UIHandler().post(() -> {
                 notifyTextEmpty(activity);
                 refreshView.onRefreshComplete();
-            }).post();
+            });
             return;
         }
         Paging paging = TwitterUtils.getPaging(activity.getRequestCountPerPage());
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java
index 16691238..9c68b2e9 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java
@@ -160,7 +160,7 @@ public class CustomListAdapter<T extends IViewModel> extends BaseAdapter {
 
     public void updateForce() {
         synchronized (LOCK) {
-            new UIHandler(this::notifyDataSetChanged).post();
+            new UIHandler().post(this::notifyDataSetChanged);
         }
     }
 }
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 9b344641..2333bd4a 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
@@ -347,12 +347,12 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
             @Override
             protected void executeCommand(Command command) {
                 super.executeCommand(command);
-                new UIHandler(() -> {
+                new UIHandler().postDelayed(() -> {
                     if (UserDetailDialogFragment.this.isDetached()) {
                         return;
                     }
                     updateRelationship(activity, user.getId());
-                }).postDelayed(1000);
+                }, 1000);
             }
         };
         menuFragment.setUserID(user.getId());
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/listener/ListItemClickListener.java b/app/src/main/java/net/lacolaco/smileessence/view/listener/ListItemClickListener.java
index 3ed73acb..93a20c33 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/listener/ListItemClickListener.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/listener/ListItemClickListener.java
@@ -55,9 +55,9 @@ public class ListItemClickListener implements View.OnClickListener {
         final int currentBgColor = ((ColorDrawable) v.getBackground()).getColor();
         v.setBackgroundColor(activity.getResources().getColor(R.color.metro_blue));
         v.invalidate();
-        new UIHandler(() -> {
+        new UIHandler().post(() -> {
             v.setBackgroundColor(currentBgColor);
             callback.run();
-        }).post();
+        });
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/viewmodel/CheckBoxModel.java b/app/src/main/java/net/lacolaco/smileessence/viewmodel/CheckBoxModel.java
index 08b3ad7e..eaa1ddf5 100644
--- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/CheckBoxModel.java
+++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/CheckBoxModel.java
@@ -68,12 +68,7 @@ public class CheckBoxModel implements IViewModel {
         }
         CheckBox checkBox = (CheckBox) convertedView.findViewById(R.id.checkBox_menuItem);
         checkBox.setText(this.text);
-        checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                CheckBoxModel.this.checked = isChecked;
-            }
-        });
+        checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> CheckBoxModel.this.checked = isChecked);
         checkBox.setChecked(checked);
         return convertedView;
     }
diff --git a/app/src/main/java/net/lacolaco/smileessence/viewmodel/EditableCheckBoxModel.java b/app/src/main/java/net/lacolaco/smileessence/viewmodel/EditableCheckBoxModel.java
index ccfd9e70..c9ad6ec9 100644
--- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/EditableCheckBoxModel.java
+++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/EditableCheckBoxModel.java
@@ -93,12 +93,7 @@ public class EditableCheckBoxModel implements IViewModel {
         checkBox.setText(this.text);
         checkBox.setChecked(checked);
         checkBox.setEnabled(!isFreezing());
-        checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                EditableCheckBoxModel.this.setChecked(isChecked);
-            }
-        });
+        checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> EditableCheckBoxModel.this.setChecked(isChecked));
         EditText editText = (EditText) convertedView.findViewById(R.id.edittext_editable_checkbox);
         editText.addTextChangedListener(new TextWatcher() {
             @Override
diff --git a/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java b/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java
index 4391a76a..284581aa 100644
--- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java
+++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java
@@ -162,13 +162,10 @@ public class EventViewModel implements IViewModel {
         favorited.setVisibility(View.GONE);
         int colorBgNormal = Themes.getStyledColor(activity, theme, R.attr.color_status_bg_normal, 0);
         convertedView.setBackgroundColor(colorBgNormal);
-        convertedView.setOnClickListener(new ListItemClickListener(activity, new Runnable() {
-            @Override
-            public void run() {
-                UserDetailDialogFragment fragment = new UserDetailDialogFragment();
-                fragment.setUserID(getSourceUserID());
-                DialogHelper.showDialog(activity, fragment);
-            }
+        convertedView.setOnClickListener(new ListItemClickListener(activity, () -> {
+            UserDetailDialogFragment fragment = new UserDetailDialogFragment();
+            fragment.setUserID(getSourceUserID());
+            DialogHelper.showDialog(activity, fragment);
         }));
         return convertedView;
     }
diff --git a/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java b/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java
index b6c640b5..7a7bb527 100644
--- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java
+++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java
@@ -96,13 +96,10 @@ public class MessageViewModel implements IViewModel {
         int theme = ((MainActivity) activity).getThemeIndex();
         NetworkImageView icon = (NetworkImageView) convertedView.findViewById(R.id.imageview_status_icon);
         ImageCache.getInstance().setImageToView(directMessage.getSender().getProfileImageUrl(), icon);
-        icon.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                UserDetailDialogFragment dialogFragment = new UserDetailDialogFragment();
-                dialogFragment.setUserID(directMessage.getSender().getId());
-                DialogHelper.showDialog(activity, dialogFragment);
-            }
+        icon.setOnClickListener(v -> {
+            UserDetailDialogFragment dialogFragment = new UserDetailDialogFragment();
+            dialogFragment.setUserID(directMessage.getSender().getId());
+            DialogHelper.showDialog(activity, dialogFragment);
         });
         TextView header = (TextView) convertedView.findViewById(R.id.textview_status_header);
         header.setTextSize(textSize);