Code cleanup and ReadMe content update

Author: titusgicheru

README.md

@@ -118,8 +118,8 @@ To use the Microsoft Graph SDK snippets project, you need the following:
 5. Respond to the dialog box ("Gradle Sync: Gradle settings for this project are not configured yet. Would you like the project to use the Gradle wrapper? ") by clicking the **OK** button to use the Gradle wrapper. 
 4. In the application registration page that you just visited, copy the custom redirect URI (`msal{application id as GUID}`) to the clipboard. **Be sure you don't copy `://auth`**
    <br/>For example: `msal0575d7fe-8ec7-4925-9ce2-87074778a039` is copied and `://auth` is ignored.
-4. Paste the clipboard contents in **app/src/main/AndroidManifest.xml**, line 42 to replace `ENTER_YOUR_CLIENT_ID` with the clipboard contents.
-4. Copy the **GUID portion** of the custom redirect URI into **app/src/main/AndroidManifest.xml**, line 51 to replace `ENTER_YOUR_CLIENT_ID` with the clipboard contents.
+4. Paste the clipboard contents in **app/src/main/AndroidManifest.xml**, line 41 to replace `ENTER_YOUR_CLIENT_ID` with the clipboard contents.
+4. Copy the **GUID portion** of the custom redirect URI into **app/src/main/AndroidManifest.xml**, line 49 to replace `ENTER_YOUR_CLIENT_ID` with the clipboard contents.
 
 ## Run the project
 After you've built the project you can run it on an emulator or device.

app/build.gradle

@@ -55,7 +55,7 @@ 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'
+    //implementation 'com.microsoft.graph:microsoft-graph:1.2.0'
+  //  implementation 'com.microsoft.identity.client:msal:0.2.2'
     implementation 'com.microsoft.graph:microsoft-graph-android-auth:0.1.0-SNAPSHOT'
 }

app/src/main/AndroidManifest.xml

@@ -38,15 +38,14 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="msalEnter_ClientId_Here"
-                    android:host="auth" />
+                <data android:scheme="msalENTER_YOUR_CLIENT_ID"  android:host="auth" />
             </intent-filter>
         </activity>
         <meta-data
             android:name="authority string"
             android:value="https://login.microsoftonline.com/common"/>
         <meta-data
             android:name="com.microsoft.identity.client.ClientId"
-            android:value="Enter_ClientId_Here"/>
+            android:value="ENTER_YOUR_CLIENT_ID"/>
     </application>
 </manifest>

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

@@ -33,7 +33,6 @@ public class AuthenticationManager implements IAuthenticationProvider {
     private static PublicClientApplication mPublicClientApplication;
     private AuthenticationResult mAuthResult;
     private MSALAuthenticationCallback mActivityCallback;
-    public static  MSALAuthenticationProvider msalAuthenticationProvider;
 
     private AuthenticationManager() {
     }

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

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

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

@@ -17,6 +17,8 @@ public class SnippetApp extends Application {
     private static SnippetApp sSnippetApp;
     private static SignInActivity signInActivity;
     private AuthenticationManager mAuthenticationManager;
+    private MSALAuthenticationProvider msalAuthenticationProvider;
+    private IGraphServiceClient graphClient;
 
     public static SnippetApp getApp() {
         return sSnippetApp;
@@ -33,17 +35,22 @@ public void onCreate() {
 
     public IGraphServiceClient getGraphServiceClient() {
 
-        MSALAuthenticationProvider msalAuthenticationProvider = new MSALAuthenticationProvider(
-                getAppActivity(),
-                SnippetApp.getApp(),
-                mAuthenticationManager.getPublicClient(),
-                ServiceConstants.SCOPES);
-
-         IGraphServiceClient graphClient =
-                GraphServiceClient
-                        .builder()
-                        .authenticationProvider(msalAuthenticationProvider)
-                        .buildClient();
+        if(msalAuthenticationProvider == null) {
+            msalAuthenticationProvider = new MSALAuthenticationProvider(
+                    getAppActivity(),
+                    SnippetApp.getApp(),
+                    mAuthenticationManager.getPublicClient(),
+                    ServiceConstants.SCOPES);
+        }
+
+        if(graphClient == null) {
+            graphClient =
+                    GraphServiceClient
+                            .builder()
+                            .authenticationProvider(msalAuthenticationProvider)
+                            .buildClient();
+        }
+
          return graphClient;
     }