corrected photo logic

Author: JohnMAustin

app/src/main/java/com/microsoft/graph/connect/Connect.java

@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.os.StrictMode;
 import android.support.multidex.MultiDex;
 import android.support.multidex.MultiDexApplication;
 
@@ -33,6 +34,8 @@ public void onCreate(){
         super.onCreate();
 
         mLogs = new StringBuffer();
+        StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
+        StrictMode.setThreadPolicy(policy);
 
         // Logging can be turned on four different levels: error, warning, info, and verbose. By default the sdk is turning on
         // verbose level logging. Any apps can use Logger.getInstance().setLogLevel(Loglevel) to enable different level of logging.

app/src/main/java/com/microsoft/graph/connect/Constants.java

@@ -11,5 +11,5 @@ public class Constants {
     // The Microsoft Graph delegated permissions that you set in the application
     // registration portal must match these scope values.
     // Update this constant with the scope (permission) values for your application:
-    public static final String[] SCOPES = {"openid", "profile","Mail.ReadWrite","mail.send","Files.ReadWrite","User.ReadBasic.All"};
+    public static final String[] SCOPES = {"openid", "Mail.ReadWrite","mail.send","Files.ReadWrite","User.ReadBasic.All"};
 }

app/src/main/java/com/microsoft/graph/connect/GraphServiceClientManager.java

@@ -6,6 +6,7 @@
 
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
+import android.util.Log;
 
 import com.microsoft.graph.authentication.IAuthenticationProvider;
 import com.microsoft.graph.core.DefaultClientConfig;
@@ -40,6 +41,8 @@ public void authenticateRequest(IHttpRequest request)  {
             // This header has been added to identify this sample in the Microsoft Graph service.
             // If you're using this code for your project please remove the following line.
             request.addHeader("SampleID", "android-java-connect-sample");
+
+            Log.i("Connect","Request: " + request.toString());
         } catch (AuthenticatorException e) {
             e.printStackTrace();
         } catch (IOException e) {

app/src/main/java/com/microsoft/graph/connect/GraphServiceController.java

@@ -12,6 +12,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Environment;
+import android.os.NetworkOnMainThreadException;
 import android.os.StrictMode;
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
@@ -119,6 +120,10 @@ public void addPictureToDraftMessage(String messageId,
             fileAttachment.contentBytes = attachementBytes;
             //fileAttachment.contentType = "image/png";
             fileAttachment.name = "me.png";
+            fileAttachment.size = attachementBytes.length;
+            fileAttachment.isInline = false;
+            fileAttachment.id = "blabla";
+            Log.i("connect sample","attachement id " + fileAttachment.id);
             mGraphServiceClient
                     .getMe()
                     .getMessages(messageId)
@@ -189,21 +194,40 @@ public void success(final InputStream inputStream) {
                             try {
                                 byte[] pictureBytes = new byte[1024];
                                 BufferedInputStream bufferedInputStream = (BufferedInputStream) inputStream;
+                                byte[] buff = new byte[8000];
+
+
+                                ByteArrayOutputStream bao  = new ByteArrayOutputStream();
+                                int bytesRead = 0;
+                                byte[] data = new byte[0];
+                                try {
+                                    //This seems to be executing on the main thread!!!
+                                    while ((bytesRead = bufferedInputStream.read(buff)) != -1) {
+                                        bao.write(buff, 0, bytesRead);
+                                    }
+                                     data = bao.toByteArray();
+
+                                } catch (NetworkOnMainThreadException ex) {
+                                    Log.e("Connect" , "Attempting to read buffered network resource on main thread " + ex.getMessage());
+
+                                }
+
+
 
-                                StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
-                                StrictMode.setThreadPolicy(policy);
 
                                 //If the user's photo is not available, get the default test.jpg from the device external
                                 //storage root folder
-                                if (bufferedInputStream.available() < 1) {
+                               // if (bufferedInputStream.available() < 1) {
+                                if (data.length == 0)
+                                {
                                     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP){
                                         pictureBytes = getDefaultPicture();
                                     }
                                     else {
                                         pictureBytes = getTestPicture();
                                     }
                                 } else {
-                                    pictureBytes = convertBufferToBytes(bufferedInputStream, inputStream.available());
+                                    pictureBytes = data; //convertBufferToBytes(bufferedInputStream, inputStream.available());
                                 }
                                 callback.success(pictureBytes);
                             } catch (IOException e) {

app/src/main/java/com/microsoft/graph/connect/SendMailActivity.java

@@ -223,7 +223,8 @@ private void getDraftMessage(final Message aMessage, final Permission permission
         mGraphServiceController.getDraftMessage(aMessage.id, new ICallback<Message>() {
             public void success(final Message aMessage) {
                 Log.i("SendMailActivity", "Adding picture to draft message ");
-                addPictureToDraftMessage(aMessage, permission, bytes);
+                sendDraftMessage(aMessage);
+
             }
 
             public void failure(ClientException ex) {