From fca1ce9bf7c63b98c3b367649d9bb6b45d6a0461 Mon Sep 17 00:00:00 2001
From: NudeDude <extremeoverclocking>
Date: Thu, 15 Aug 2019 17:55:58 +0200
Subject: [PATCH] bug fix, gradle updates

---
 .idea/gradle.xml                              |  2 +-
 app/build.gradle                              |  1 +
 .../nuclearfog/twidda/window/ProfileEdit.java | 22 ++++++++-----------
 .../nuclearfog/twidda/window/TweetDetail.java |  4 ++--
 .../nuclearfog/twidda/window/UserProfile.java |  8 +++----
 build.gradle                                  |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 ++--
 7 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cfee34fb..8f2b0820 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="/opt/Gradle/gradle-5.4.1" />
+        <option name="gradleHome" value="/opt/Gradle/gradle-5.5.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/build.gradle b/app/build.gradle
index 7c43555a..421e024e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,6 +21,7 @@ android {
         release {
             debuggable false
             minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
diff --git a/app/src/main/java/org/nuclearfog/twidda/window/ProfileEdit.java b/app/src/main/java/org/nuclearfog/twidda/window/ProfileEdit.java
index c800a438..4941a279 100644
--- a/app/src/main/java/org/nuclearfog/twidda/window/ProfileEdit.java
+++ b/app/src/main/java/org/nuclearfog/twidda/window/ProfileEdit.java
@@ -96,8 +96,15 @@ public class ProfileEdit extends AppCompatActivity implements OnClickListener {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.action_save) {
-            if (editorAsync == null || editorAsync.getStatus() != RUNNING)
-                save();
+            if (editorAsync == null || editorAsync.getStatus() != RUNNING) {
+                EditText name = findViewById(R.id.edit_name);
+                if (name.getText().toString().trim().isEmpty()) {
+                    Toast.makeText(this, R.string.edit_empty_name, LENGTH_SHORT).show();
+                } else {
+                    editorAsync = new ProfileEditor(this, WRITE_DATA);
+                    editorAsync.execute();
+                }
+            }
         }
         return super.onOptionsItemSelected(item);
     }
@@ -135,17 +142,6 @@ public class ProfileEdit extends AppCompatActivity implements OnClickListener {
     }
 
 
-    private void save() {
-        EditText name = findViewById(R.id.edit_name);
-        if (name.getText().toString().trim().isEmpty()) {
-            Toast.makeText(this, R.string.edit_empty_name, LENGTH_SHORT).show();
-        } else {
-            editorAsync = new ProfileEditor(this, WRITE_DATA);
-            editorAsync.execute();
-        }
-    }
-
-
     private void getMedia() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             int check = checkSelfPermission(READ_EXTERNAL_STORAGE);
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 e48e889d..ea7e9e17 100644
--- a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
+++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
@@ -123,10 +123,10 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
 
 
     @Override
-    protected void onStop() {
-        super.onStop();
+    protected void onDestroy() {
         if (statusAsync != null && statusAsync.getStatus() == RUNNING)
             statusAsync.cancel(true);
+        super.onDestroy();
     }
 
 
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 b0d5f527..371abba2 100644
--- a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java
+++ b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java
@@ -31,7 +31,6 @@ import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.adapter.FragmentAdapter;
 import org.nuclearfog.twidda.adapter.FragmentAdapter.AdapterType;
 import org.nuclearfog.twidda.backend.ProfileLoader;
-import org.nuclearfog.twidda.backend.ProfileLoader.Mode;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.text.NumberFormat;
@@ -41,6 +40,7 @@ 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.backend.ProfileLoader.Mode.LDR_PROFILE;
 import static org.nuclearfog.twidda.window.MessagePopup.KEY_DM_ADDITION;
 import static org.nuclearfog.twidda.window.SearchPage.KEY_SEARCH;
 import static org.nuclearfog.twidda.window.TweetPopup.KEY_TWEETPOPUP_ADDITION;
@@ -132,17 +132,17 @@ public class UserProfile extends AppCompatActivity implements OnClickListener, O
     protected void onStart() {
         super.onStart();
         if (profileAsync == null) {
-            profileAsync = new ProfileLoader(this, Mode.LDR_PROFILE);
+            profileAsync = new ProfileLoader(this, LDR_PROFILE);
             profileAsync.execute(userId);
         }
     }
 
 
     @Override
-    protected void onStop() {
+    protected void onDestroy() {
         if (profileAsync != null && profileAsync.getStatus() == RUNNING)
             profileAsync.cancel(true);
-        super.onStop();
+        super.onDestroy();
     }
 
 
diff --git a/build.gradle b/build.gradle
index 2b83b863..9acf2806 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 545fdf3f..7bdce994 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jan 10 20:47:44 CET 2018
+#Mon Jul 29 11:05:47 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip