diff options
3 files changed, 1 insertions, 68 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandSearchOnTwitter.java b/app/src/main/java/net/lacolaco/smileessence/command/CommandSearchOnTwitter.java deleted file mode 100644 index 24d858e7..00000000 --- a/app/src/main/java/net/lacolaco/smileessence/command/CommandSearchOnTwitter.java +++ /dev/null @@ -1,58 +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.command; - -import android.app.Activity; -import net.lacolaco.smileessence.R; -import net.lacolaco.smileessence.activity.MainActivity; - -public class CommandSearchOnTwitter extends Command { - - // ------------------------------ FIELDS ------------------------------ - - private final String text; - - // --------------------------- CONSTRUCTORS --------------------------- - - public CommandSearchOnTwitter(Activity activity, String text) { - super(activity); - this.text = text; - } - - // --------------------- GETTER / SETTER METHODS --------------------- - - @Override - public String getText() { - return getActivity().getString(R.string.command_search_on_twitter); - } - - // -------------------------- OTHER METHODS -------------------------- - - @Override - public boolean execute() { - ((MainActivity) getActivity()).openSearchPage(text); - return true; - } -} 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 372c1eef..c84c04e9 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 @@ -28,7 +28,6 @@ import android.app.Activity; import android.app.Dialog; import android.os.Bundle; import net.lacolaco.smileessence.command.Command; -import net.lacolaco.smileessence.command.CommandSearchOnTwitter; import java.util.ArrayList; import java.util.List; @@ -55,10 +54,7 @@ public class HashtagDialogFragment extends MenuDialogFragment { @Override protected List<Command> getMenuCommands() { - Activity activity = getActivity(); List<Command> commands = new ArrayList<>(); - String text = getHashtagText(); - commands.add(new CommandSearchOnTwitter(activity, text)); return commands; } diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserMenuDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserMenuDialogFragment.java index cb0d5b65..13d212ee 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserMenuDialogFragment.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserMenuDialogFragment.java @@ -27,10 +27,8 @@ package net.lacolaco.smileessence.view.dialog; import android.app.Activity; import android.os.Bundle; import net.lacolaco.smileessence.command.Command; -import net.lacolaco.smileessence.command.CommandSearchOnTwitter; import net.lacolaco.smileessence.entity.User; -import java.util.ArrayList; import java.util.List; public class UserMenuDialogFragment extends MenuDialogFragment { @@ -63,9 +61,6 @@ public class UserMenuDialogFragment extends MenuDialogFragment { @Override protected List<Command> getMenuCommands() { Activity activity = getActivity(); - List<Command> commands = new ArrayList<>(); - commands.addAll(Command.getUserCommands(activity, user)); - commands.add(new CommandSearchOnTwitter(activity, user.getScreenName())); - return commands; + return Command.getUserCommands(activity, user); } } |