From 5944b707854f749f762e81e1ed7c059e782696bf Mon Sep 17 00:00:00 2001
From: NudeDude <hatespirit666@gmail.com>
Date: Sat, 18 Aug 2018 17:57:00 +0200
Subject: [PATCH] code cleanup

---
 app/proguard-rules.pro                                |  4 ++--
 .../main/java/org/nuclearfog/twidda/MainActivity.java | 11 ++++-------
 .../java/org/nuclearfog/twidda/backend/MainPage.java  |  2 +-
 .../org/nuclearfog/twidda/backend/Registration.java   |  3 +--
 .../org/nuclearfog/twidda/backend/StatusLoader.java   |  2 +-
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 81c96ea2..94721200 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -30,5 +30,5 @@
 -dontwarn javax.**
 -keep class javax.** {*;}
 
--dontwarn org.**
--keep class org.** {*;}
\ No newline at end of file
+-dontwarn org.conscrypt**
+-keep class org.conscrypt** {*;}
\ No newline at end of file
diff --git a/app/src/main/java/org/nuclearfog/twidda/MainActivity.java b/app/src/main/java/org/nuclearfog/twidda/MainActivity.java
index 38d6e15e..26c4cf77 100644
--- a/app/src/main/java/org/nuclearfog/twidda/MainActivity.java
+++ b/app/src/main/java/org/nuclearfog/twidda/MainActivity.java
@@ -44,7 +44,6 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
     private TabHost tabhost;
     private int tabIndex = 0;
     private boolean settingChanged = false;
-    private final int REQ_CODE = 1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -56,7 +55,7 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
 
         if( !login ) {
             Intent i = new Intent(this, LoginPage.class);
-            startActivityForResult(i,REQ_CODE);
+            startActivityForResult(i, 1);
         }
 
         timelineList = findViewById(R.id.tl_list);
@@ -105,11 +104,9 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
     @Override
     protected void onActivityResult(int reqCode, int returnCode, Intent i) {
         super.onActivityResult(reqCode,returnCode,i);
-        if(reqCode == REQ_CODE) {
-            if (returnCode != RESULT_OK) {
-                overridePendingTransition(0, 0);
-                finish();
-            }
+        if (returnCode == RESULT_CANCELED) {
+            overridePendingTransition(0, 0);
+            finish();
         }
     }
 
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java b/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java
index 7a8f4444..0f2fa927 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java
@@ -146,7 +146,7 @@ public class MainPage extends AsyncTask<Integer, Void, Integer> {
                     mentionAdapter.setData(mention);
                     break;
             }
-        } catch(TwitterException e) {
+        } catch (TwitterException e) {
             returnCode = e.getErrorCode();
             if (returnCode > 0 && returnCode != 420) {
                 errMsg += e.getMessage();
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/Registration.java b/app/src/main/java/org/nuclearfog/twidda/backend/Registration.java
index 155970c5..7d66d293 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/Registration.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/Registration.java
@@ -68,5 +68,4 @@ public class Registration extends AsyncTask<String, Void, Boolean> {
     public interface OnConnect {
         void connect(String link);
     }
-}
-
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
index a86fbe96..a56335bc 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
@@ -144,7 +144,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
                 if(!favorited) {
                     favCount++;
                     favorited = true;
-                    database.storeFavorite(tweet);
+                    database.storeFavorite(tweetID);
                 } else {
                     if(favCount > 0)
                         favCount--;