From eebac4d98d36527f411c948d93c73c264cf276f6 Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Wed, 9 Oct 2019 20:45:47 +0200
Subject: [PATCH] code cleanup

---
 .../nuclearfog/twidda/window/TweetDetail.java | 19 +------------------
 .../nuclearfog/twidda/window/UserProfile.java |  7 ++-----
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
index e719fd52..9b0f7733 100644
--- a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
+++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
@@ -11,11 +11,9 @@ import android.os.Bundle;
 import android.text.method.ScrollingMovementMethod;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
-import android.view.View.OnTouchListener;
 import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -41,8 +39,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static android.os.AsyncTask.Status.RUNNING;
-import static android.view.MotionEvent.ACTION_DOWN;
-import static android.view.MotionEvent.ACTION_UP;
 import static android.widget.Toast.LENGTH_SHORT;
 import static org.nuclearfog.twidda.window.SearchPage.KEY_SEARCH;
 import static org.nuclearfog.twidda.window.TweetPopup.KEY_TWEETPOPUP_ADDITION;
@@ -51,8 +47,7 @@ import static org.nuclearfog.twidda.window.UserDetail.KEY_USERLIST_ID;
 import static org.nuclearfog.twidda.window.UserDetail.KEY_USERLIST_MODE;
 
 
-public class TweetDetail extends AppCompatActivity implements OnClickListener, OnLongClickListener,
-        OnTouchListener, OnTagClickListener {
+public class TweetDetail extends AppCompatActivity implements OnClickListener, OnLongClickListener, OnTagClickListener {
 
     public static final String KEY_TWEET_ID = "tweetID";
     public static final String KEY_TWEET_NAME = "username";
@@ -107,7 +102,6 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
         ansButton.setOnClickListener(this);
         rtwButton.setOnClickListener(this);
         favButton.setOnClickListener(this);
-        tweetTxt.setOnTouchListener(this);
         rtwButton.setOnLongClickListener(this);
         favButton.setOnLongClickListener(this);
     }
@@ -246,17 +240,6 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
     }
 
 
-    @Override
-    public boolean onTouch(View v, MotionEvent event) {
-        int action = event.getActionMasked() & event.getAction();
-        if (action == ACTION_UP || action == ACTION_DOWN) {
-            v.getParent().requestDisallowInterceptTouchEvent(true);
-            return false;
-        }
-        return v.performClick();
-    }
-
-
     public void setIsHome() {
         isHome = true;
         invalidateOptionsMenu();
diff --git a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java
index 24c3bf88..316d4ba0 100644
--- a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java
+++ b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java
@@ -15,7 +15,6 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog.Builder;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -66,10 +65,8 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
     private ViewPager pager;
     private View follow_back;
 
-    private @Nullable
-    UserProperties connection;
-    private @Nullable
-    TwitterUser user;
+    private UserProperties connection;
+    private TwitterUser user;
     private String username;
     private long userId;