Code cleanup

titusgicheru · titusgicheru · commit e25407e58904 · 2019-04-18T14:41:20.000+03:00
diff --git a/app/src/androidTest/java/com/microsoft/graph/snippets/SignInActivityTests.java b/app/src/androidTest/java/com/microsoft/graph/snippets/SignInActivityTests.java
@@ -10,18 +10,14 @@
 import android.support.test.espresso.web.webdriver.Locator;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-
 import junit.framework.AssertionFailedError;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import java.io.FileNotFoundException;
-
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.intent.Intents.intended;
diff --git a/app/src/androidTest/java/com/microsoft/graph/snippets/SnippetDetailActivityTests.java b/app/src/androidTest/java/com/microsoft/graph/snippets/SnippetDetailActivityTests.java
@@ -9,17 +9,14 @@
 import android.support.test.espresso.intent.Intents;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import java.io.FileNotFoundException;
 import java.util.List;
-
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.Espresso.registerIdlingResources;
 import static android.support.test.espresso.Espresso.unregisterIdlingResources;
diff --git a/app/src/androidTest/java/com/microsoft/graph/snippets/SnippetListActivityTests.java b/app/src/androidTest/java/com/microsoft/graph/snippets/SnippetListActivityTests.java
@@ -10,19 +10,15 @@
 import android.support.test.runner.AndroidJUnit4;
 import android.widget.ListAdapter;
 import android.widget.ListView;
-
 import com.microsoft.graph.snippets.snippet.AbstractSnippet;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
 import static android.support.test.espresso.action.ViewActions.click;
diff --git a/app/src/androidTest/java/com/microsoft/graph/snippets/TestCredentials.java b/app/src/androidTest/java/com/microsoft/graph/snippets/TestCredentials.java
@@ -5,10 +5,8 @@
 package com.microsoft.graph.snippets;
 
 import android.os.Environment;
-
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
diff --git a/app/src/main/java/com/microsoft/graph/snippets/AuthenticationManager.java b/app/src/main/java/com/microsoft/graph/snippets/AuthenticationManager.java
@@ -9,19 +9,15 @@
 import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
-
 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.IAccount;
 import com.microsoft.identity.client.PublicClientApplication;
-//import com.microsoft.identity.client.User;
 import com.microsoft.identity.client.exception.MsalException;
-
 import java.io.IOException;
 
 /**
diff --git a/app/src/main/java/com/microsoft/graph/snippets/BaseActivity.java b/app/src/main/java/com/microsoft/graph/snippets/BaseActivity.java
@@ -6,6 +6,5 @@
 
 import android.app.Activity;
 
-
 public abstract class BaseActivity extends Activity {
 }
diff --git a/app/src/main/java/com/microsoft/graph/snippets/MSALAuthenticationCallback.java b/app/src/main/java/com/microsoft/graph/snippets/MSALAuthenticationCallback.java
@@ -1,10 +1,8 @@
 package com.microsoft.graph.snippets;
 
 import com.microsoft.identity.client.AuthenticationResult;
-//import com.microsoft.identity.client.MsalException;
 import com.microsoft.identity.client.exception.MsalException;
 
-
 interface MSALAuthenticationCallback {
     void onSuccess(AuthenticationResult authenticationResult);
     void onError(MsalException exception);
diff --git a/app/src/main/java/com/microsoft/graph/snippets/SignInActivity.java b/app/src/main/java/com/microsoft/graph/snippets/SignInActivity.java
@@ -10,7 +10,6 @@
 import android.view.View;
 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;
@@ -22,20 +21,12 @@
 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;
 import java.util.UUID;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 import static com.microsoft.graph.snippets.R.id.layout_diagnostics;
@@ -152,7 +143,7 @@ private void warnBadClient() {
     private void authenticate() throws IllegalArgumentException {
         validateOrganizationArgs();
         connect();
-        //AuthenticationManager.getInstance().
+        AuthenticationManager.getInstance();
     }
 
     private void connect() {
@@ -191,13 +182,7 @@ private void connect() {
                         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) {
             Log.d(TAG, "User at this position does not exist: " + e.toString());
             Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/com/microsoft/graph/snippets/SnippetDetailFragment.java b/app/src/main/java/com/microsoft/graph/snippets/SnippetDetailFragment.java
@@ -23,21 +23,17 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.microsoft.graph.concurrency.ICallback;
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.snippets.snippet.AbstractSnippet;
 import com.microsoft.graph.snippets.snippet.SnippetContent;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static com.microsoft.graph.snippets.R.color.code_1xx;
diff --git a/app/src/main/java/com/microsoft/graph/snippets/SnippetListActivity.java b/app/src/main/java/com/microsoft/graph/snippets/SnippetListActivity.java
@@ -7,7 +7,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-
 import com.microsoft.graph.snippets.application.SnippetApp;
 import com.microsoft.graph.snippets.application.AppModule;
 
diff --git a/app/src/main/java/com/microsoft/graph/snippets/SnippetListAdapter.java b/app/src/main/java/com/microsoft/graph/snippets/SnippetListAdapter.java
@@ -10,7 +10,6 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
-
 import com.microsoft.graph.snippets.snippet.AbstractSnippet;
 import com.microsoft.graph.snippets.snippet.SnippetContent;
 
diff --git a/app/src/main/java/com/microsoft/graph/snippets/application/AppModule.java b/app/src/main/java/com/microsoft/graph/snippets/application/AppModule.java
@@ -3,7 +3,6 @@
  * See LICENSE in the project root for license information.
  */
 package com.microsoft.graph.snippets.application;
-
 import com.microsoft.graph.snippets.ServiceConstants;
 
 public class AppModule {
@@ -13,5 +12,4 @@ public class AppModule {
     public String providesRestEndpoint() {
         return ServiceConstants.AUTHENTICATION_RESOURCE_ID;
     }
-
 }
diff --git a/app/src/main/java/com/microsoft/graph/snippets/application/SnippetApp.java b/app/src/main/java/com/microsoft/graph/snippets/application/SnippetApp.java
@@ -6,18 +6,12 @@
 
 import android.app.Application;
 import android.content.Context;
-
 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.requests.extensions.GraphServiceClient;
 import com.microsoft.graph.models.extensions.IGraphServiceClient;
 import com.microsoft.graph.snippets.AuthenticationManager;
 
-
 public class SnippetApp extends Application {
     private static SnippetApp sSnippetApp;
     private AuthenticationManager mAuthenticationManager;
@@ -47,6 +41,4 @@ public static Context getContext() {
     public void disconnect() {
         mAuthenticationManager.disconnect();
     }
-
-
 }
diff --git a/app/src/main/java/com/microsoft/graph/snippets/snippet/AbstractSnippet.java b/app/src/main/java/com/microsoft/graph/snippets/snippet/AbstractSnippet.java
@@ -5,7 +5,6 @@
 package com.microsoft.graph.snippets.snippet;
 
 import com.microsoft.graph.concurrency.ICallback;
-//import com.microsoft.graph.extensions.IGraphServiceClient;
 import com.microsoft.graph.models.extensions.IGraphServiceClient;
 import com.microsoft.graph.snippets.application.SnippetApp;
 
diff --git a/app/src/main/java/com/microsoft/graph/snippets/snippet/DrivesSnippets.java b/app/src/main/java/com/microsoft/graph/snippets/snippet/DrivesSnippets.java
@@ -12,17 +12,11 @@
 import com.microsoft.graph.models.extensions.DriveItem;
 import com.microsoft.graph.models.extensions.Folder;
 import com.microsoft.graph.requests.extensions.IDriveItemCollectionPage;
-//import com.microsoft.graph.extensions.Drive;
-//import com.microsoft.graph.extensions.DriveItem;
-//import com.microsoft.graph.extensions.Folder;
-//import com.microsoft.graph.extensions.IDriveItemCollectionPage;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.util.UUID;
-
 import static com.microsoft.graph.snippets.R.array.create_me_file;
 import static com.microsoft.graph.snippets.R.array.create_me_folder;
 import static com.microsoft.graph.snippets.R.array.delete_me_file;
@@ -421,6 +415,5 @@ public void failure(ClientException ex) {
                 }
         };
     }
-
     public abstract void request(ICallback<Result> callback);
 }
diff --git a/app/src/main/java/com/microsoft/graph/snippets/snippet/EventsSnippets.java b/app/src/main/java/com/microsoft/graph/snippets/snippet/EventsSnippets.java
@@ -16,20 +16,8 @@
 import com.microsoft.graph.models.generated.AttendeeType;
 import com.microsoft.graph.models.generated.BodyType;
 import com.microsoft.graph.requests.extensions.IEventCollectionPage;
-//import com.microsoft.graph.extensions.Attendee;
-//import com.microsoft.graph.extensions.AttendeeType;
-//import com.microsoft.graph.extensions.BodyType;
-//import com.microsoft.graph.extensions.DateTimeTimeZone;
-//import com.microsoft.graph.extensions.EmailAddress;
-//import com.microsoft.graph.extensions.Event;
-//import com.microsoft.graph.extensions.IEventCollectionPage;
-//import com.microsoft.graph.extensions.ItemBody;
-//import com.microsoft.graph.extensions.Location;
-
 import org.joda.time.DateTime;
-
 import java.util.Collections;
-
 import static com.microsoft.graph.snippets.R.array.create_event;
 import static com.microsoft.graph.snippets.R.array.delete_event;
 import static com.microsoft.graph.snippets.R.array.get_user_events;
diff --git a/app/src/main/java/com/microsoft/graph/snippets/snippet/GroupsSnippets.java b/app/src/main/java/com/microsoft/graph/snippets/snippet/GroupsSnippets.java
@@ -10,13 +10,8 @@
 import com.microsoft.graph.models.extensions.Group;
 import com.microsoft.graph.requests.extensions.IDirectoryObjectCollectionWithReferencesPage;
 import com.microsoft.graph.requests.extensions.IGroupCollectionPage;
-//import com.microsoft.graph.extensions.Group;
-//import com.microsoft.graph.extensions.IDirectoryObjectCollectionWithReferencesPage;
-//import com.microsoft.graph.extensions.IGroupCollectionPage;
-
 import java.util.Collections;
 import java.util.UUID;
-
 import static com.microsoft.graph.snippets.R.array.delete_a_group;
 import static com.microsoft.graph.snippets.R.array.get_a_group;
 import static com.microsoft.graph.snippets.R.array.get_all_groups;
diff --git a/app/src/main/java/com/microsoft/graph/snippets/snippet/MeSnippets.java b/app/src/main/java/com/microsoft/graph/snippets/snippet/MeSnippets.java
@@ -7,20 +7,14 @@
 import com.google.gson.JsonObject;
 import com.microsoft.graph.concurrency.ICallback;
 import com.microsoft.graph.core.ClientException;
-//import com.microsoft.graph.extensions.DirectoryObject;
-//import com.microsoft.graph.extensions.IDirectoryObjectCollectionWithReferencesPage;
-//import com.microsoft.graph.extensions.ProfilePhoto;
-//import com.microsoft.graph.extensions.User;
 import com.microsoft.graph.models.extensions.DirectoryObject;
 import com.microsoft.graph.models.extensions.ProfilePhoto;
 import com.microsoft.graph.models.extensions.User;
 import com.microsoft.graph.options.Option;
 import com.microsoft.graph.options.QueryOption;
 import com.microsoft.graph.requests.extensions.IDirectoryObjectCollectionWithReferencesPage;
-
 import java.util.LinkedList;
 import java.util.List;
-
 import static com.microsoft.graph.snippets.R.array.get_me;
 import static com.microsoft.graph.snippets.R.array.get_me_direct_reports;
 import static com.microsoft.graph.snippets.R.array.get_me_group_membership;
@@ -200,7 +194,6 @@ public void failure(ClientException ex) {
                 }
         };
     }
-
     @Override
     public abstract void request(ICallback<Result> callback);
 
diff --git a/app/src/main/java/com/microsoft/graph/snippets/snippet/MessageSnippets.java b/app/src/main/java/com/microsoft/graph/snippets/snippet/MessageSnippets.java
@@ -5,16 +5,9 @@
 package com.microsoft.graph.snippets.snippet;
 
 import android.content.SharedPreferences;
-
 import com.google.gson.JsonObject;
 import com.microsoft.graph.concurrency.ICallback;
 import com.microsoft.graph.core.ClientException;
-//import com.microsoft.graph.extensions.BodyType;
-//import com.microsoft.graph.extensions.EmailAddress;
-//import com.microsoft.graph.extensions.IMessageCollectionPage;
-//import com.microsoft.graph.extensions.ItemBody;
-//import com.microsoft.graph.extensions.Message;
-//import com.microsoft.graph.extensions.Recipient;
 import com.microsoft.graph.models.extensions.EmailAddress;
 import com.microsoft.graph.models.extensions.ItemBody;
 import com.microsoft.graph.models.extensions.Message;
@@ -24,9 +17,7 @@
 import com.microsoft.graph.snippets.R;
 import com.microsoft.graph.snippets.application.SnippetApp;
 import com.microsoft.graph.snippets.util.SharedPrefsUtil;
-
 import java.util.Collections;
-
 import static com.microsoft.graph.snippets.R.array.get_user_messages;
 import static com.microsoft.graph.snippets.R.array.send_an_email_message;
 
@@ -117,8 +108,8 @@ private static Message createMessageObject() {
         Recipient recipient = new Recipient();
         recipient.emailAddress = new EmailAddress();
         recipient.emailAddress.address = prefs.getString(SharedPrefsUtil.PREF_USER_ID, "");
-        message.toRecipients = Collections.singletonList(recipient);
 
+        message.toRecipients = Collections.singletonList(recipient);
         message.subject = app.getString(R.string.mail_subject);
 
         ItemBody itemBody = new ItemBody();
diff --git a/app/src/main/java/com/microsoft/graph/snippets/snippet/SnippetCategory.java b/app/src/main/java/com/microsoft/graph/snippets/snippet/SnippetCategory.java
@@ -5,7 +5,6 @@
 package com.microsoft.graph.snippets.snippet;
 
 import com.microsoft.graph.snippets.application.SnippetApp;
-
 import static com.microsoft.graph.snippets.R.string.section_drives;
 import static com.microsoft.graph.snippets.R.string.section_events;
 import static com.microsoft.graph.snippets.R.string.section_groups;
diff --git a/app/src/main/java/com/microsoft/graph/snippets/snippet/SnippetContent.java b/app/src/main/java/com/microsoft/graph/snippets/snippet/SnippetContent.java
@@ -7,7 +7,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import static com.microsoft.graph.snippets.snippet.DrivesSnippets.getDrivesSnippets;
 import static com.microsoft.graph.snippets.snippet.EventsSnippets.getEventsSnippets;
 import static com.microsoft.graph.snippets.snippet.GroupsSnippets.getGroupsSnippets;
diff --git a/app/src/main/java/com/microsoft/graph/snippets/snippet/UsersSnippets.java b/app/src/main/java/com/microsoft/graph/snippets/snippet/UsersSnippets.java

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,5 @@`
`6`	`6`
`7`	`7`	`import android.app.Activity;`
`8`	`8`
`9`		`-`
`10`	`9`	`public abstract class BaseActivity extends Activity {`
`11`	`10`	`}`