Update from Android-SDK to Java-SDK

Author: titusgicheru

README.md

@@ -88,25 +88,23 @@ To use the Microsoft Graph SDK snippets project, you need the following:
 
 ## Azure client application registration
 
-
-1. Sign in to the [Application Registration portal](https://apps.dev.microsoft.com).
-3. Click on the blue **Add an app** button on the right side of the page.
-4. Give your application a name.
-4. _Un_-check **Let us help you get started** under the **Guided Setup** section
-4. Click the blue **Create** button to create the registration.
-5. Click the **Add Platform** button under the **Platforms** section and choose **Native Application**.
-8. Configure Permissions for your application - Under **Microsoft Graph Permissions** click the blue **Add** button adjacent to **Delegated Permissions**
-9. Add the following delegated permissions:
-   * Sign in and read user profile
-   * Have full access to all files user can access
-   * Have full access to user calendars
-   * Read and write access to user mail 
-   * Send mail as a user
-   * Read user mail
-   * Read and write directory data
-   * Read all users' basic profiles
-   * Read and write all groups
-13. Click **Save** in the bottom menu.
+1. Navigate to the [Azure portal - App registrations](https://go.microsoft.com/fwlink/?linkid=2083908) page. 
+1. Select **New registration**. 
+1. When the **Register an application page** appears, enter your application's registration information: 
+    - In the **Name** section, enter a meaningful application name that will be displayed to users of the app, for example `Android Java Snippets Sample`. 
+    - In the **Supported account types** section, select **Accounts in any organizational directory**. 
+1. Select **Register** to create the application. 
+1. On the app **Overview** page, find the **Application (client) ID** value and record it for later. You'll need it to configure the Visual Studio configuration file for this project. 
+1. In the list of pages for the app, select **Manifest**, and: 
+    - In the manifest editor, set the ``allowPublicClient`` property to **true** 
+    - Select **Save** in the bar above the manifest editor. 
+1. In the list of pages for the app, select **API permissions** 
+    - Click the **Add a permission** button and then, 
+    - Ensure that the **Microsoft APIs** tab is selected 
+    - In the *Commonly used Microsoft APIs* section, click on **Microsoft Graph** 
+    - In the **Delegated permissions** section, ensure that the right permissions are checked. Use the search box if necessary.
+    - **User.Read**, **Mail.Send** **Mail.ReadWrite**, **Files.ReadWrite**,**User.ReadBasic.All**, **Calendars.ReadWrite**,**Group.Read.All**  
+    - Select the **Add permissions** button 
 
 > **Note:**
 > In [Configure the project](#configure-the-project), you'll be asked to copy some strings that are generated by the application registration portal. Be sure to stay on application registration page while you configure the project. The strings that you copy from the application registration will be pasted into the source code of the project.
@@ -188,4 +186,4 @@ General questions about Microsoft Graph development should be posted to [Stack O
 |1.0|Initial release|
 |1.5|- MSAL authentication library replaced ADAL authentication library <br/> - Microsoft Graph SDK version 1.5|
 
-Copyright (c) 2015 Microsoft. All rights reserved.
+Copyright (c) 2019 Microsoft. All rights reserved.

app/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 26
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "com.microsoft.graph.snippets"
         minSdkVersion 21
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 2
         versionName '1.5'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -15,7 +15,6 @@ android {
                 includeCompileClasspath false
             }
         }
-
     }
     buildTypes {
         release {
@@ -28,6 +27,7 @@ android {
         exclude 'META-INF/NOTICE.txt'
         exclude 'META-INF/maven/com.google.guava/guava/pom.properties'
         exclude 'META-INF/maven/com.google.guava/guava/pom.xml'
+        exclude 'META-INF/jersey-module-version'
     }
     configurations {
         all {
@@ -39,16 +39,12 @@ android {
 }
 
 dependencies {
-    implementation('com.microsoft.identity.client:msal:0.1.+') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
     implementation 'com.android.volley:volley:1.0.0'
     implementation 'com.android.support:support-fragment:25.1.0'
     implementation 'com.android.support:appcompat-v7:25.1.0'
     // Butterknife
     implementation 'com.jakewharton:butterknife:8.4.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
-    implementation 'com.microsoft.graph:msgraph-sdk-android:1.5.0'
     implementation 'joda-time:joda-time:2.9.4'
     implementation 'com.google.guava:guava:19.0'
     // Test libraries
@@ -59,4 +55,6 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-intents:2.2.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-web:2.2.2'
+    implementation 'com.microsoft.graph:microsoft-graph:1.2.0'
+    implementation 'com.microsoft.identity.client:msal:0.2.2'
 }

app/src/main/java/com/microsoft/graph/snippets/AuthenticationManager.java

@@ -12,12 +12,15 @@
 
 import com.microsoft.graph.authentication.IAuthenticationProvider;
 import com.microsoft.graph.http.IHttpRequest;
+import com.microsoft.graph.models.extensions.User;
 import com.microsoft.graph.snippets.application.SnippetApp;
 import com.microsoft.identity.client.AuthenticationCallback;
 import com.microsoft.identity.client.AuthenticationResult;
-import com.microsoft.identity.client.MsalException;
+//import com.microsoft.identity.client.MsalException;
+import com.microsoft.identity.client.IAccount;
 import com.microsoft.identity.client.PublicClientApplication;
-import com.microsoft.identity.client.User;
+//import com.microsoft.identity.client.User;
+import com.microsoft.identity.client.exception.MsalException;
 
 import java.io.IOException;
 
@@ -66,7 +69,7 @@ public PublicClientApplication getPublicClient(){
      * to null, and removing the user id from shred preferences.
      */
     public void disconnect() {
-        mPublicClientApplication.remove(mAuthResult.getUser());
+        mPublicClientApplication.removeAccount(mAuthResult.getAccount());
         // Reset the AuthenticationManager object
         AuthenticationManager.resetInstance();
     }
@@ -82,7 +85,7 @@ public void callAcquireToken(Activity activity, final MSALAuthenticationCallback
         mPublicClientApplication.acquireToken(
                 activity, ServiceConstants.SCOPES, getAuthInteractiveCallback());
     }
-    public void callAcquireTokenSilent(User user, boolean forceRefresh, MSALAuthenticationCallback msalAuthenticationCallback) {
+    public void callAcquireTokenSilent(IAccount user, boolean forceRefresh, MSALAuthenticationCallback msalAuthenticationCallback) {
         mActivityCallback = msalAuthenticationCallback;
         mPublicClientApplication.acquireTokenSilentAsync(ServiceConstants.SCOPES, user, null, forceRefresh, getAuthSilentCallback());
     }

app/src/main/java/com/microsoft/graph/snippets/MSALAuthenticationCallback.java

@@ -1,7 +1,8 @@
 package com.microsoft.graph.snippets;
 
 import com.microsoft.identity.client.AuthenticationResult;
-import com.microsoft.identity.client.MsalException;
+//import com.microsoft.identity.client.MsalException;
+import com.microsoft.identity.client.exception.MsalException;
 
 
 interface MSALAuthenticationCallback {

app/src/main/java/com/microsoft/graph/snippets/ServiceConstants.java

@@ -10,5 +10,5 @@ public class ServiceConstants {
     // 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", "Mail.ReadWrite","mail.send","Files.ReadWrite","User.ReadBasic.All"};
+    public static final String[] SCOPES = {"openid", "Mail.ReadWrite","Mail.Send","Files.ReadWrite","User.ReadBasic.All", "Calendars.ReadWrite","Group.Read.All"};
 }

app/src/main/java/com/microsoft/graph/snippets/SignInActivity.java

@@ -11,16 +11,22 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.microsoft.graph.models.extensions.User;
 import com.microsoft.graph.snippets.util.IManifestReader;
 import com.microsoft.graph.snippets.util.ManifestReader;
 import com.microsoft.graph.snippets.util.SharedPrefsUtil;
 import com.microsoft.identity.client.AuthenticationResult;
+import com.microsoft.identity.client.IAccount;
 import com.microsoft.identity.client.Logger;
-import com.microsoft.identity.client.MsalClientException;
-import com.microsoft.identity.client.MsalException;
-import com.microsoft.identity.client.MsalServiceException;
-import com.microsoft.identity.client.MsalUiRequiredException;
-import com.microsoft.identity.client.User;
+import com.microsoft.identity.client.exception.MsalClientException;
+import com.microsoft.identity.client.exception.MsalException;
+import com.microsoft.identity.client.exception.MsalServiceException;
+import com.microsoft.identity.client.exception.MsalUiRequiredException;
+//import com.microsoft.identity.client.MsalClientException;
+//import com.microsoft.identity.client.MsalException;
+//import com.microsoft.identity.client.MsalServiceException;
+//import com.microsoft.identity.client.MsalUiRequiredException;
+//import com.microsoft.identity.client.User;
 
 import java.net.URI;
 import java.util.List;
@@ -84,8 +90,8 @@ public void onSuccess(AuthenticationResult authenticationResult) {
         // get the user display name
         final String userDisplayableId =
                 authenticationResult
-                        .getUser()
-                        .getDisplayableId();
+                        .getAccount()
+                        .getUsername();
 
         // get the index of their '@' in the name (to determine domain)
         final int at = userDisplayableId.indexOf("@");
@@ -164,10 +170,10 @@ private void connect() {
         /* Attempt to get a user and acquireTokenSilent
          * If this fails we do an interactive request
          */
-        List<User> users = null;
+        List<IAccount> users = null;
 
         try {
-            users = mgr.getPublicClient().getUsers();
+            users = mgr.getPublicClient().getAccounts();
 
             if (users != null && users.size() == 1) {
                 /* We have 1 user */
@@ -184,12 +190,15 @@ private void connect() {
                         this,
                         this);
             }
-        } catch (MsalClientException e) {
-            Log.d(TAG, "MSAL Exception Generated while getting users: " + e.toString());
-            Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
-
+        }
 
-        } catch (IndexOutOfBoundsException e) {
+//        catch (MsalClientException e) {
+//            Log.d(TAG, "MSAL Exception Generated while getting users: " + e.toString());
+//            Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
+//
+//
+//        }
+        catch (IndexOutOfBoundsException e) {
             Log.d(TAG, "User at this position does not exist: " + e.toString());
             Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
 
@@ -215,7 +224,7 @@ private void start() {
         startActivity(appLaunch);
     }
 
-    public User mUser;
+    public IAccount mUser;
 
     @Override
     public void onError(Exception exception) {

app/src/main/java/com/microsoft/graph/snippets/application/SnippetApp.java

@@ -9,8 +9,12 @@
 
 import com.microsoft.graph.core.DefaultClientConfig;
 import com.microsoft.graph.core.IClientConfig;
-import com.microsoft.graph.extensions.GraphServiceClient;
-import com.microsoft.graph.extensions.IGraphServiceClient;
+
+//import com.microsoft.graph.extensions.GraphServiceClient;
+//import com.microsoft.graph.extensions.IGraphServiceClient;
+
+import com.microsoft.graph.requests.extensions.GraphServiceClient;
+import com.microsoft.graph.models.extensions.IGraphServiceClient;
 import com.microsoft.graph.snippets.AuthenticationManager;
 
 
@@ -33,7 +37,7 @@ public IGraphServiceClient getGraphServiceClient() {
         IClientConfig clientConfig = DefaultClientConfig.createWithAuthenticationProvider(
                 mAuthenticationManager
         );
-        return new GraphServiceClient.Builder().fromConfig(clientConfig).buildClient();
+        return GraphServiceClient.fromConfig(clientConfig);
     }
 
     public static Context getContext() {

app/src/main/java/com/microsoft/graph/snippets/snippet/AbstractSnippet.java

@@ -5,7 +5,8 @@
 package com.microsoft.graph.snippets.snippet;
 
 import com.microsoft.graph.concurrency.ICallback;
-import com.microsoft.graph.extensions.IGraphServiceClient;
+//import com.microsoft.graph.extensions.IGraphServiceClient;
+import com.microsoft.graph.models.extensions.IGraphServiceClient;
 import com.microsoft.graph.snippets.application.SnippetApp;
 
 public abstract class AbstractSnippet<Result> {