vastly untested refactor. pushing for backup purposes

2 files changed, 5 insertions, 22 deletions

diff --git a/src/main/java/de/pixart/messenger/utils/SendButtonAction.java b/src/main/java/de/pixart/messenger/ui/util/SendButtonAction.java
index a3d548c15..6258b49c6 100644
--- a/src/main/java/de/pixart/messenger/utils/SendButtonAction.java
+++ b/src/main/java/de/pixart/messenger/ui/util/SendButtonAction.java
@@ -27,12 +27,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package de.pixart.messenger.utils;
+package de.pixart.messenger.ui.util;
 
-import static de.pixart.messenger.ui.ConversationActivity.ATTACHMENT_CHOICE_CHOOSE_IMAGE;
-import static de.pixart.messenger.ui.ConversationActivity.ATTACHMENT_CHOICE_LOCATION;
-import static de.pixart.messenger.ui.ConversationActivity.ATTACHMENT_CHOICE_RECORD_VOICE;
-import static de.pixart.messenger.ui.ConversationActivity.ATTACHMENT_CHOICE_TAKE_FROM_CAMERA;
+import static de.pixart.messenger.ui.ConversationFragment.ATTACHMENT_CHOICE_CHOOSE_IMAGE;
+import static de.pixart.messenger.ui.ConversationFragment.ATTACHMENT_CHOICE_LOCATION;
+import static de.pixart.messenger.ui.ConversationFragment.ATTACHMENT_CHOICE_RECORD_VOICE;
+import static de.pixart.messenger.ui.ConversationFragment.ATTACHMENT_CHOICE_TAKE_FROM_CAMERA;
 
 public enum SendButtonAction {
     TEXT, TAKE_FROM_CAMERA, SEND_LOCATION, RECORD_VOICE, CANCEL, CHOOSE_PICTURE;
diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java
index 08e1d7dad..f42d6b73e 100644
--- a/src/main/java/de/pixart/messenger/utils/UIHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java
@@ -540,21 +540,4 @@ public class UIHelper {
                 return new ListItem.Tag(context.getString(R.string.presence_online), 0xff259b24, 0);
         }
     }
-
-    public static String tranlasteType(Context context, String type) {
-        switch (type.toLowerCase()) {
-            case "pc":
-                return context.getString(R.string.type_pc);
-            case "phone":
-                return context.getString(R.string.type_phone);
-            case "tablet":
-                return context.getString(R.string.type_tablet);
-            case "web":
-                return context.getString(R.string.type_web);
-            case "console":
-                return context.getString(R.string.type_console);
-            default:
-                return type;
-        }
-    }
 }