diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2016-09-22 16:46:22 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-09-22 16:46:22 +0900 |
commit | 9ab8f921e1d04c405c279ae1cdd08228138a6db5 (patch) | |
tree | 6b1dbaed22af299cd0dd64bbd97cde8e5ece67db /app/src | |
parent | c6baed1af10d6d24e404a245e2dbbbff9bba5e4e (diff) | |
download | SmileEssence-9ab8f921e1d04c405c279ae1cdd08228138a6db5.tar.gz |
remove unused code
Diffstat (limited to 'app/src')
16 files changed, 9 insertions, 244 deletions
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 1ce2b526..a61255ac 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java @@ -397,7 +397,7 @@ public class MainActivity extends Activity implements Application.OnCurrentAccou openPostPageWithImage(uri); } - private boolean startStream() { + private void startStream() { if (stream != null) { new Thread(stream::cleanUp).start(); } @@ -406,7 +406,6 @@ public class MainActivity extends Activity implements Application.OnCurrentAccou stream.addListener(userStreamListener); stream.addConnectionLifeCycleListener(userStreamListener); stream.user(); - return true; } @Override diff --git a/app/src/main/java/net/lacolaco/smileessence/data/Account.java b/app/src/main/java/net/lacolaco/smileessence/data/Account.java index c45a8286..69aee53e 100644 --- a/app/src/main/java/net/lacolaco/smileessence/data/Account.java +++ b/app/src/main/java/net/lacolaco/smileessence/data/Account.java @@ -61,13 +61,6 @@ public class Account { public Account() { } - public Account(long userId, String screenName, String token, String tokenSecret) { - this.userId = userId; - this.screenName = screenName; - this.oauthToken = token; - this.oauthTokenSecret = tokenSecret; - } - // --------------------- static methods --------------------- public static synchronized Account get(long i) { if (cache == null) { diff --git a/app/src/main/java/net/lacolaco/smileessence/entity/Tweet.java b/app/src/main/java/net/lacolaco/smileessence/entity/Tweet.java index 0515c2b5..af989a1d 100644 --- a/app/src/main/java/net/lacolaco/smileessence/entity/Tweet.java +++ b/app/src/main/java/net/lacolaco/smileessence/entity/Tweet.java @@ -174,10 +174,6 @@ public class Tweet extends EntitySupport { return getOriginalTweet().inReplyToStatusId; } - public Tweet getInReplyToIfPresent() { - return Tweet.fetch(getInReplyToStatusId()); - } - public boolean isFavoritedBy(long id) { return getOriginalTweet().favoriters.contains(id); } diff --git a/app/src/main/java/net/lacolaco/smileessence/preference/SharedPreferenceHelper.java b/app/src/main/java/net/lacolaco/smileessence/preference/SharedPreferenceHelper.java index 9cea0a6a..979dc732 100644 --- a/app/src/main/java/net/lacolaco/smileessence/preference/SharedPreferenceHelper.java +++ b/app/src/main/java/net/lacolaco/smileessence/preference/SharedPreferenceHelper.java @@ -40,11 +40,6 @@ public abstract class SharedPreferenceHelper { return getPreferences().getString(getString(key), defaultValue); } - @Deprecated - public String get(String key, String defaultValue) { - return getPreferences().getString(key, defaultValue); - } - // int, long, float value may be stored in String format (old versions) public int get(int key, int defaultValue) { try { @@ -90,13 +85,6 @@ public abstract class SharedPreferenceHelper { .commit(); } - @Deprecated - public boolean set(String key, String value) { - return getPreferences().edit() - .putString(key, value) - .commit(); - } - public boolean set(int key, int value) { return getPreferences().edit() .putInt(getString(key), value) diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/TweetBuilder.java b/app/src/main/java/net/lacolaco/smileessence/twitter/TweetBuilder.java deleted file mode 100644 index 2d71793c..00000000 --- a/app/src/main/java/net/lacolaco/smileessence/twitter/TweetBuilder.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2012-2014 lacolaco.net - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package net.lacolaco.smileessence.twitter; - -import android.text.TextUtils; -import twitter4j.StatusUpdate; - -import java.io.File; -import java.util.ArrayList; - -public class TweetBuilder { - - // ------------------------------ FIELDS ------------------------------ - - private String text = ""; - private ArrayList<String> screenNameList = new ArrayList<>(); - private long inReplyToStatusID = -1; - private String mediaPath = ""; - - // --------------------- GETTER / SETTER METHODS --------------------- - - public TweetBuilder setInReplyToStatusID(long inReplyToStatusID) { - this.inReplyToStatusID = inReplyToStatusID; - return this; - } - - public TweetBuilder setMediaPath(String mediaPath) { - this.mediaPath = mediaPath; - return this; - } - - public TweetBuilder setText(String text) { - this.text = text; - return this; - } - - // -------------------------- OTHER METHODS -------------------------- - - public TweetBuilder addScreenName(String screenName) { - if (!screenNameList.contains(screenName)) { - screenNameList.add(screenName); - } - return this; - } - - public TweetBuilder appendText(String str) { - return setText(text + str); - } - - public StatusUpdate build() { - StatusUpdate statusUpdate = new StatusUpdate(buildText()); - if (inReplyToStatusID >= 0) { - statusUpdate.setInReplyToStatusId(inReplyToStatusID); - } - if (!TextUtils.isEmpty(mediaPath)) { - File media = new File(mediaPath); - if (media.exists()) { - statusUpdate.setMedia(media); - } - } - return statusUpdate; - } - - public String buildText() { - StringBuilder builder = new StringBuilder(); - - for (String screenName : screenNameList) { - builder.append(String.format("@%s ", screenName)); - } - builder.append(text); - return builder.toString(); - } -} diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/task/ShowDirectMessageTask.java b/app/src/main/java/net/lacolaco/smileessence/twitter/task/ShowDirectMessageTask.java deleted file mode 100644 index 05268dcc..00000000 --- a/app/src/main/java/net/lacolaco/smileessence/twitter/task/ShowDirectMessageTask.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2012-2014 lacolaco.net - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package net.lacolaco.smileessence.twitter.task; - -import net.lacolaco.smileessence.data.Account; -import net.lacolaco.smileessence.entity.DirectMessage; -import net.lacolaco.smileessence.util.BackgroundTask; -import twitter4j.TwitterException; - -public class ShowDirectMessageTask extends BackgroundTask<DirectMessage, Void> { - - // ------------------------------ FIELDS ------------------------------ - - private final Account account; - private final long messageID; - - // --------------------------- CONSTRUCTORS --------------------------- - - public ShowDirectMessageTask(Account account, long messageID) { - this.account = account; - this.messageID = messageID; - } - - // ------------------------ OVERRIDE METHODS ------------------------ - - @Override - protected DirectMessage doInBackground() throws TwitterException { - return DirectMessage.fromTwitter(account.getTwitter().directMessages().showDirectMessage(messageID)); - } -} diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/task/ShowFriendshipTask.java b/app/src/main/java/net/lacolaco/smileessence/twitter/task/ShowFriendshipTask.java index 6e21a2d5..77d029f0 100644 --- a/app/src/main/java/net/lacolaco/smileessence/twitter/task/ShowFriendshipTask.java +++ b/app/src/main/java/net/lacolaco/smileessence/twitter/task/ShowFriendshipTask.java @@ -35,28 +35,16 @@ public class ShowFriendshipTask extends BackgroundTask<Relationship, Void> { private final Account account; private final long userID; - private final String screenName; // --------------------------- CONSTRUCTORS --------------------------- public ShowFriendshipTask(Account account, long userID) { this.account = account; this.userID = userID; - this.screenName = null; - } - - public ShowFriendshipTask(Account account, String screenName) { - this.account = account; - this.screenName = screenName; - this.userID = -1; } @Override protected Relationship doInBackground() throws TwitterException { - if (screenName != null) { - return account.getTwitter().friendsFollowers().showFriendship(account.getTwitter().getScreenName(), screenName); - } else { - return account.getTwitter().friendsFollowers().showFriendship(account.getTwitter().getId(), userID); - } + return account.getTwitter().friendsFollowers().showFriendship(account.getTwitter().getId(), userID); } } diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/task/TimelineTask.java b/app/src/main/java/net/lacolaco/smileessence/twitter/task/TimelineTask.java index c216df50..0b151a1e 100644 --- a/app/src/main/java/net/lacolaco/smileessence/twitter/task/TimelineTask.java +++ b/app/src/main/java/net/lacolaco/smileessence/twitter/task/TimelineTask.java @@ -32,11 +32,6 @@ import java.util.List; public abstract class TimelineTask<T> extends BackgroundTask<List<T>, Void> { private Paging paging = new Paging(); - public TimelineTask<T> setPage(int page) { - paging.setPage(page); - return this; - } - public TimelineTask<T> setCount(int count) { paging.setCount(count); return this; diff --git a/app/src/main/java/net/lacolaco/smileessence/util/BackgroundTask.java b/app/src/main/java/net/lacolaco/smileessence/util/BackgroundTask.java index dbe13d77..90671b26 100644 --- a/app/src/main/java/net/lacolaco/smileessence/util/BackgroundTask.java +++ b/app/src/main/java/net/lacolaco/smileessence/util/BackgroundTask.java @@ -48,7 +48,7 @@ public abstract class BackgroundTask<Result, Progress> { } public BackgroundTask<Result, Progress> onFinishUI(Runnable cb) { - return onFinish(() -> new UIHandler().post(cb::run)); + return onFinish(() -> new UIHandler().post(cb)); } public boolean cancel() { diff --git a/app/src/main/java/net/lacolaco/smileessence/util/BiConsumer.java b/app/src/main/java/net/lacolaco/smileessence/util/BiConsumer.java deleted file mode 100644 index 84179bf9..00000000 --- a/app/src/main/java/net/lacolaco/smileessence/util/BiConsumer.java +++ /dev/null @@ -1,5 +0,0 @@ -package net.lacolaco.smileessence.util; - -public interface BiConsumer<T, U> { - void accept(T t, U u); -} diff --git a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java index ee8f8170..6b198310 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java @@ -46,11 +46,6 @@ public class SettingFragment extends PreferenceFragment implements OnSharedPrefe Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener { private static final int TEXT_SIZE_MIN = 8; private static final int TEXT_SIZE_MAX = 24; - private static final int TIMELINES_MIN = 1; - private static final int TIMELINES_MAX = 200; - - // ------------------------ INTERFACE METHODS ------------------------ - // --------------------- Interface OnPreferenceChangeListener --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/SearchListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/SearchListAdapter.java index 55f8ce9a..48657748 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/SearchListAdapter.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/SearchListAdapter.java @@ -27,10 +27,6 @@ package net.lacolaco.smileessence.view.adapter; import android.app.Activity; public class SearchListAdapter extends StatusListAdapter { - - // ------------------------------ FIELDS ------------------------------ - - //private long topID; private String query; private OnQueryChangeListener listener; @@ -42,23 +38,10 @@ public class SearchListAdapter extends StatusListAdapter { // --------------------- GETTER / SETTER METHODS --------------------- - public OnQueryChangeListener getListener() { - return listener; - } - public String getQuery() { return query; } - //@Override - //public long getTopID() { - // return topID; - //} - - //public void setTopID(long topID) { - // this.topID = topID; - //} - public void setOnQueryChangeListener(OnQueryChangeListener listener) { this.listener = listener; } @@ -68,7 +51,6 @@ public class SearchListAdapter extends StatusListAdapter { public void initSearch(String query) { this.query = query; clear(); - // topID = 0; if (listener != null) { listener.onQueryChange(query); } 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 c1f1a821..79574623 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 @@ -45,7 +45,6 @@ import net.lacolaco.smileessence.data.Account; import net.lacolaco.smileessence.entity.RBinding; import net.lacolaco.smileessence.entity.Tweet; import net.lacolaco.smileessence.notification.Notificator; -import net.lacolaco.smileessence.twitter.TweetBuilder; import net.lacolaco.smileessence.twitter.task.*; import net.lacolaco.smileessence.util.Themes; import net.lacolaco.smileessence.util.UIObserverBundle; @@ -310,15 +309,14 @@ public class StatusDetailDialogFragment extends StackableDialogFragment implemen Account account = Application.getInstance().getCurrentAccount(); Tweet originalTweet = tweet.getOriginalTweet(); - TweetBuilder builder = new TweetBuilder(); - builder.addScreenName(originalTweet.getUser().getScreenName()); + StringBuilder builder = new StringBuilder(); + builder.append("@" + originalTweet.getUser().getScreenName() + " "); + for (String screenName : originalTweet.getMentions()) { - if (!screenName.equals(account.getUser().getScreenName())) { - builder.addScreenName(screenName); - } + if (!screenName.equals(account.getUser().getScreenName())) + builder.append("@" + screenName + " "); } - - String text = builder.buildText(); + String text = builder.toString(); int selStart = originalTweet.getUser().getScreenName().length() + 2; // "@" and " " PostState.newState().beginTransaction() diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/CustomListFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/page/CustomListFragment.java index 012578f4..12064b3d 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/CustomListFragment.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/CustomListFragment.java @@ -39,9 +39,6 @@ import net.lacolaco.smileessence.view.adapter.CustomListAdapter; public abstract class CustomListFragment<T extends CustomListAdapter> extends PageFragment<T> implements AbsListView.OnScrollListener, PullToRefreshBase.OnRefreshListener2<ListView> { - // ------------------------------ FIELDS ------------------------------ - - public static final int SCROLL_DURATION = 1500; // --------------------- GETTER / SETTER METHODS --------------------- protected PullToRefreshBase.Mode getRefreshMode() { 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 ffdaaa36..d9101c39 100644 --- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java +++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java @@ -82,22 +82,10 @@ public class EventViewModel implements IViewModel { return createdAt; } - public EnumEvent getEvent() { - return event; - } - public boolean isStatusEvent() { return targetObject != null; } - public Tweet getTargetObject() { - return targetObject; - } - - public User getSource() { - return source; - } - // ------------------------ INTERFACE METHODS ------------------------ 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 bbc9f51b..0f982c5e 100644 --- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java +++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java @@ -53,8 +53,6 @@ public class MessageViewModel implements IViewModel, IdObject { // ------------------------------ FIELDS ------------------------------ - public static final String DETAIL_DIALOG = "messageDetail"; - private final DirectMessage directMessage; // --------------------------- CONSTRUCTORS --------------------------- |