Merge lp:~mzanetti/telegram-app/avatar-spinner into lp:telegram-app

[Michael Zanetti]

don't start the spinner if we don't have anything to fetch

This is a "fix" for the issue that victor found in QA today.

The issue was that when clicking the avatar of some contact details page (or the settings page), the app tries to load the big image from the network and displays a spinner for that. Now the problem was, that this was triggered even when there is no profile picture, in which case the spinner just keeps on spinning forever. In the account settings page, this even suggests that it would try to open content hub for importing a picture and keeps the user waiting forever.

We could probably improve this and actually open the content hub, however, this component is used also when you view another contact's details in which case we can't set the image so it's not 100% straight forward. This patch at least doesn't start the spinner if we don't have anything to fetch from the network and doesn't keep the user waiting.

Importing a new avatar is, after all, done from the toolbar icon for that.

[Michał Karnicki (karni)]

Thank you :D

review: Approve

=== modified file 'telegram/app/qml/ClickableContactImage.qml'
--- telegram/app/qml/ClickableContactImage.qml	2015-09-22 09:57:07 +0000
+++ telegram/app/qml/ClickableContactImage.qml	2016-03-03 00:56:34 +0000
@@ -8,6 +8,7 @@
     height: 62
 
     property FileLocation photoBigLocation: isChat ? chat.photo.photoBig : user.photo.photoBig
+    property FileLocation photoSmallLocation: isChat ? chat.photo.photoSmall : user.photo.photoSmall
 
     signal clicked(string path)
 
@@ -32,6 +33,10 @@
         cursorShape: Qt.PointingHandCursor
         visible: user.id != telegram.cutegramId
         onClicked: {
+            if (smallFilePath.length == 0) {
+                return;
+            }
+
             if(filePath.length == 0) {
                 loadingPhoto = true
                 telegram.getFile(photoBigLocation)
@@ -42,6 +47,7 @@
 
         property bool loadingPhoto: false
         property string filePath: photoBigLocation.download.location
+        property string smallFilePath: photoSmallLocation.download.location
 
         onFilePathChanged: {
             if(!loadingPhoto)