Only upload avatar if there was a change.

src/org/thoughtcrime/securesms/CreateProfileActivity.java

@@ -67,6 +67,7 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.security.SecureRandom;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
@@ -100,6 +101,7 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
   private View                   reveal;
 
   private Intent nextIntent;
+  private byte[] originalAvatarBytes;
   private byte[] avatarBytes;
   private File   captureFile;
 
@@ -305,6 +307,7 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
         @Override
         protected void onPostExecute(byte[] result) {
           if (result != null) {
+            originalAvatarBytes = result;
             avatarBytes = result;
             GlideApp.with(CreateProfileActivity.this)
                     .load(result)
@@ -318,6 +321,7 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
         @Override
         public void onSuccess(byte[] result) {
           if (result != null) {
+            originalAvatarBytes = result;
             avatarBytes = result;
             GlideApp.with(CreateProfileActivity.this)
                     .load(result)
@@ -396,6 +400,8 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
           }
         }
 
+        // Loki - Only update avatar if there was a change
+        if (!Arrays.equals(originalAvatarBytes, avatarBytes)) {
           try {
             // Loki - Original profile photo code
             // ========
@@ -429,6 +435,7 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
             Log.d("Loki", "Failed to upload profile photo: " + e);
             return false;
           }
+        }
 
         // ApplicationContext.getInstance(context).getJobManager().add(new MultiDeviceProfileKeyUpdateJob());
         return true;