Merge pull request #1620 from nextcloud/fix-avatars

Fix avatars

src/gplay/AndroidManifest.xml

@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.owncloud.android"
-          android:versionCode="20000008"
-          android:versionName="2.0.0RC8">
+          android:versionCode="20000009"
+          android:versionName="2.0.0RC9">
 
     <application
         android:name=".MainApp"

src/main/AndroidManifest.xml

@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.owncloud.android"
-          android:versionCode="20000008"
-          android:versionName="2.0.0RC8">
+          android:versionCode="20000009"
+          android:versionName="2.0.0RC9">
 
     <uses-sdk
         android:minSdkVersion="14"

src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -22,6 +22,7 @@
 package com.owncloud.android.datamodel;
 
 import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
@@ -34,6 +35,7 @@ import android.media.MediaMetadataRetriever;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.text.TextUtils;
 import android.view.MenuItem;
 import android.widget.ImageView;
 
@@ -653,8 +655,15 @@ public class ThumbnailsCacheManager {
                     if (serverOCVersion.supportsRemoteThumbnails()) {
                         GetMethod get = null;
                         try {
-                            String uri = mClient.getBaseUri() + "" +
-                                    "/index.php/avatar/" + AccountUtils.getAccountUsername(username) + "/" + px;
+
+                            String userId = AccountManager.get(MainApp.getAppContext()).getUserData(mAccount,
+                                    com.owncloud.android.lib.common.accounts.AccountUtils.Constants.KEY_USER_ID);
+
+                            if (TextUtils.isEmpty(userId)) {
+                                userId = AccountUtils.getAccountUsername(username);
+                            }
+
+                            String uri = mClient.getBaseUri() + "" + "/index.php/avatar/" + userId + "/" + px;
                             Log_OC.d("Avatar", "URI: " + uri);
                             get = new GetMethod(uri);
                             int status = mClient.executeMethod(get);

src/modified/AndroidManifest.xml

@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.owncloud.android"
-          android:versionCode="20000008"
-          android:versionName="2.0.0RC8">
+          android:versionCode="20000009"
+          android:versionName="2.0.0RC9">
 
     <application
         android:name=".MainApp"