Bläddra i källkod

Merge pull request #8356 from nextcloud/avatarInAccount

Avatar generation can take long, so better check if ChooseAccountDialogFragment is still active
Andy Scherzinger 4 år sedan
förälder
incheckning
a6c87ac78b

+ 1 - 1
scripts/uploadReport.sh

@@ -23,7 +23,7 @@ upload() {
 
     echo "Uploaded failing tests to https://www.kaminsky.me/nc-dev/android-integrationTests/$REMOTE_FOLDER"
 
-    curl > /dev/null 2>&1 -u $GITHUB_USER:$GITHUB_PASSWORD -X POST https://api.github.com/repos/nextcloud/android/issues/$PR/comments \
+    curl -u $GITHUB_USER:$GITHUB_PASSWORD -X POST https://api.github.com/repos/nextcloud/android/issues/$PR/comments \
     -d "{ \"body\" : \"$BRANCH_TYPE test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/$REMOTE_FOLDER \" }"
 
     exit 1

+ 3 - 1
src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt

@@ -193,7 +193,9 @@ class ChooseAccountDialogFragment :
     }
 
     override fun avatarGenerated(avatarDrawable: Drawable?, callContext: Any?) {
-        binding.currentAccount.userIcon.setImageDrawable(avatarDrawable)
+        if (_binding != null) {
+            binding.currentAccount.userIcon.setImageDrawable(avatarDrawable)
+        }
     }
 
     override fun onAccountClicked(user: User?) {