From 36653c10dc040d2be14d78470acaa2a56cb57cb2 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Mon, 20 Jan 2020 19:01:41 +0100
Subject: [PATCH] Fixup profile picture selection to only allow really changed
 pictures to be submitted

---
 src/views/profile.html | 4 ++--
 src/views/profile.js   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/profile.html b/src/views/profile.html
index e9165c67c..8197d6f55 100644
--- a/src/views/profile.html
+++ b/src/views/profile.html
@@ -20,13 +20,13 @@
           </label>
         </div>
         <div ng-hide="avatarChange.useGravatar" class="preview-avatar">
-          <img id="previewAvatar" width="128" height="128" class="copy" ng-src="{{avatarChange.avatar.data || avatarChange.avatar.url}}" ng-click="avatarChange.showCustomAvatarSelector()"/>
+          <img id="previewAvatar" width="128" height="128" class="copy" ng-click="avatarChange.showCustomAvatarSelector()"/>
           <input type="file" id="avatarFileInput" style="display: none" accept="image/png"/>
         </div>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-success" ng-click="avatarChange.doChangeAvatar()" ng-disabled="avatarChange.busy || (avatarChange.useGravatarOrig === avatarChange.useGravatar && (avatarChange.useGravatar || !avatarChange.pictureChanged))"><i class="fa fa-circle-notch fa-spin" ng-show="avatarChange.busy"></i> Save</button>
+        <button type="button" class="btn btn-success" ng-click="avatarChange.doChangeAvatar()" ng-disabled="avatarChange.busy || (avatarChange.useGravatarOrig === avatarChange.useGravatar && avatarChange.useGravatar) || (!avatarChange.useGravatar && !avatarChange.pictureChanged)"><i class="fa fa-circle-notch fa-spin" ng-show="avatarChange.busy"></i> Save</button>
       </div>
     </div>
   </div>
diff --git a/src/views/profile.js b/src/views/profile.js
index 46a5bed0d..772571f83 100644
--- a/src/views/profile.js
+++ b/src/views/profile.js
@@ -168,6 +168,7 @@ angular.module('Application').controller('ProfileController', ['$scope', '$locat
         setPreviewAvatar: function (avatar) {
             $scope.avatarChange.pictureChanged = true;
             $scope.avatarChange.avatar = avatar;
+            document.getElementById('previewAvatar').src = avatar.data;
         },
 
         avatarChangeReset: function () {
@@ -175,6 +176,7 @@ angular.module('Application').controller('ProfileController', ['$scope', '$locat
             $scope.avatarChange.useGravatar = $scope.user.avatarUrl.indexOf('https://www.gravatar.com') === 0 ? 'true_string' : '';
             $scope.avatarChange.useGravatarOrig = $scope.avatarChange.useGravatar;
             $scope.avatarChange.pictureChanged = false;
+            document.getElementById('previewAvatar').src = $scope.avatarChange.useGravatar ? '' : $scope.user.avatarUrl;
             $scope.avatarChange.avatar = $scope.avatarChange.useGravatar ? {} : {
                 url: $scope.user.avatarUrl
             };