From faf73fed9186438a0630be80f28ce83a5e201d65 Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Wed, 29 Apr 2020 16:34:34 +0200
Subject: [PATCH] bug fix

---
 .../java/org/nuclearfog/twidda/activity/ProfileEditor.java  | 1 +
 .../java/org/nuclearfog/twidda/activity/UserProfile.java    | 6 ++++--
 .../java/org/nuclearfog/twidda/backend/TwitterEngine.java   | 1 -
 app/src/main/res/layout/page_editprofile.xml                | 4 +---
 app/src/main/res/values-de-rDE/strings.xml                  | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java b/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
index 1e6e4c4b..f85e5d8e 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
@@ -157,6 +157,7 @@ public class ProfileEditor extends AppCompatActivity implements OnClickListener
                         profileLink = mediaPath;
                     } else {
                         profile_banner.setImageBitmap(image);
+                        add_banner_btn.setVisibility(INVISIBLE);
                         bannerLink = mediaPath;
                     }
                     c.close();
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java b/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
index 684f02b9..2948772c 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
@@ -528,11 +528,13 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
         }
         if (settings.getImageLoad()) {
             if (user.hasBannerImg()) {
+                profile_layer.getLayoutParams().height = (int) getResources().getDimension(R.dimen.profile_banner_height);
                 String bannerLink = user.getBannerLink() + "/600x200";
                 Picasso.get().load(bannerLink).into(banner);
-                profile_layer.getLayoutParams().height = (int) getResources().getDimension(R.dimen.profile_banner_height);
-            } else
+            } else {
+                banner.setImageResource(0);
                 profile_layer.getLayoutParams().height = WRAP_CONTENT;
+            }
             profile_layer.requestLayout();
             String imgLink = user.getImageLink();
             if (!user.hasDefaultProfileImage())
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java
index 6f093dc0..271cd935 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java
@@ -774,7 +774,6 @@ public class TwitterEngine {
             if (userHolder.hasProfileImage()) {
                 File profileImage = new File(userHolder.getProfileImage());
                 twitter.updateProfileImage(profileImage);
-                twitter.removeProfileBanner();
             }
             if (userHolder.hasProfileBanner()) {
                 File profileBanner = new File(userHolder.getProfileBanner());
diff --git a/app/src/main/res/layout/page_editprofile.xml b/app/src/main/res/layout/page_editprofile.xml
index 74f8b269..dd77ff43 100644
--- a/app/src/main/res/layout/page_editprofile.xml
+++ b/app/src/main/res/layout/page_editprofile.xml
@@ -35,12 +35,10 @@
                     android:layout_gravity="center"
                     android:layout_marginLeft="@dimen/button_margin"
                     android:layout_marginRight="@dimen/button_margin"
-                    android:layout_weight="1"
                     android:background="@drawable/button"
                     android:paddingLeft="@dimen/button_padding"
                     android:paddingRight="@dimen/button_padding"
-                    android:text="@string/editprofile_add_banner"
-                    android:visibility="invisible" />
+                    android:text="@string/editprofile_add_banner" />
 
                 <ImageView
                     android:id="@+id/edit_banner"
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index d7e14a38..f99b3a87 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -147,4 +147,5 @@
     <string name="error_connection_failed">Verbindung fehlgeschlagen!</string>
     <string name="enter_username">Nutzernamen eingeben</string>
     <string name="profile_banner">Profilbanner</string>
+    <string name="editprofile_add_banner">Profilbanner hinzufügen</string>
 </resources>
\ No newline at end of file