Merge pull request #29 from OfficeDev/q2

Resetting v1.0 changes

Author: John Austin

app/build.gradle

@@ -37,10 +37,10 @@ dependencies {
     compile 'com.microsoft.services:odata-engine-android-impl:0.13.0@aar'
 
     //Office 365 SDK service libraries:
-    compile 'com.microsoft.services:outlook-services:1.0.0'
-    compile 'com.microsoft.services:discovery-services:1.0.0'
+    compile 'com.microsoft.services:outlook-services:0.13.0'
+    compile 'com.microsoft.services:discovery-services:0.13.0'
     compile 'com.microsoft.services:directory-services:0.13.0'
-    compile 'com.microsoft.services:file-services:1.0.0'
+    compile 'com.microsoft.services:file-services:0.13.0'
 
     // Azure Active Directory Library
     compile 'com.microsoft.aad:adal:1.1.3'

app/src/main/java/com/microsoft/office365/snippetapp/CalendarStories/EventsFetcherStory.java

@@ -8,7 +8,7 @@
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.BaseUserStory;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.Event;
+import com.microsoft.outlookservices.Event;
 
 import java.text.SimpleDateFormat;
 import java.util.List;

app/src/main/java/com/microsoft/office365/snippetapp/CalendarStories/RespondToCalendarEventInviteStory.java

@@ -9,7 +9,7 @@
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.GlobalValues;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.ResponseType;
+import com.microsoft.outlookservices.ResponseType;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/microsoft/office365/snippetapp/CalendarStories/UpdateEventStory.java

@@ -9,7 +9,7 @@
 import com.microsoft.office365.snippetapp.helpers.BaseUserStory;
 import com.microsoft.office365.snippetapp.helpers.GlobalValues;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.Event;
+import com.microsoft.outlookservices.Event;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/microsoft/office365/snippetapp/ContactStories/GetContactsStory.java

@@ -7,7 +7,7 @@
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.BaseUserStory;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.Contact;
+import com.microsoft.outlookservices.Contact;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

app/src/main/java/com/microsoft/office365/snippetapp/ContactStories/GetFilteredContactsWithSurnameStory.java

@@ -8,7 +8,7 @@
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.BaseUserStory;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.Contact;
+import com.microsoft.outlookservices.Contact;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

app/src/main/java/com/microsoft/office365/snippetapp/ContactStories/UpdateContactStory.java

@@ -10,7 +10,7 @@
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.BaseUserStory;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.Contact;
+import com.microsoft.outlookservices.Contact;
 
 import java.util.concurrent.ExecutionException;
 

app/src/main/java/com/microsoft/office365/snippetapp/EmailStories/BaseEmailUserStory.java

@@ -5,7 +5,7 @@
 
 import com.microsoft.office365.snippetapp.Snippets.EmailSnippets;
 import com.microsoft.office365.snippetapp.helpers.BaseUserStory;
-import com.microsoft.services.outlook.Message;
+import com.microsoft.outlookservices.Message;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

app/src/main/java/com/microsoft/office365/snippetapp/EmailStories/ForwardEmailMessageStory.java

@@ -8,7 +8,7 @@
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.GlobalValues;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.Message;
+import com.microsoft.outlookservices.Message;
 
 import java.util.concurrent.ExecutionException;
 

app/src/main/java/com/microsoft/office365/snippetapp/EmailStories/GetEmailAttachmentsStory.java

@@ -8,9 +8,9 @@
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.GlobalValues;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.Attachment;
-import com.microsoft.services.outlook.FileAttachment;
-import com.microsoft.services.outlook.Message;
+import com.microsoft.outlookservices.Attachment;
+import com.microsoft.outlookservices.FileAttachment;
+import com.microsoft.outlookservices.Message;
 
 import java.io.UnsupportedEncodingException;
 import java.util.List;

app/src/main/java/com/microsoft/office365/snippetapp/EmailStories/GetEmailMessagesStory.java

@@ -6,7 +6,7 @@
 import com.microsoft.office365.snippetapp.Snippets.EmailSnippets;
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.Message;
+import com.microsoft.outlookservices.Message;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

app/src/main/java/com/microsoft/office365/snippetapp/EmailStories/ReplyToEmailMessageStory.java

@@ -8,7 +8,7 @@
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.GlobalValues;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.Message;
+import com.microsoft.outlookservices.Message;
 
 import java.util.concurrent.ExecutionException;
 

app/src/main/java/com/microsoft/office365/snippetapp/EmailStories/SendEmailMessageStory.java

@@ -8,7 +8,7 @@
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.GlobalValues;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.Message;
+import com.microsoft.outlookservices.Message;
 
 public class SendEmailMessageStory extends BaseEmailUserStory {
 

app/src/main/java/com/microsoft/office365/snippetapp/EmailStories/SendEmailWithMessageAttachStory.java

@@ -8,7 +8,7 @@
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.GlobalValues;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.Message;
+import com.microsoft.outlookservices.Message;
 
 public class SendEmailWithMessageAttachStory extends BaseEmailUserStory {
 

app/src/main/java/com/microsoft/office365/snippetapp/FileFolderStories/GetFilesAndFoldersStory.java

@@ -3,11 +3,11 @@
  */
 package com.microsoft.office365.snippetapp.FileFolderStories;
 
+import com.microsoft.fileservices.Item;
 import com.microsoft.office365.snippetapp.Snippets.FileFolderSnippets;
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.BaseUserStory;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.files.Item;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -35,7 +35,7 @@ public String execute() {
             sb.append("\n");
             for (Item item : items) {
                 sb.append("\t\t");
-                sb.append(item.getType() + ": " + item.getName());
+                sb.append(item.gettype() + ": " + item.getname());
                 sb.append("\n");
             }
             return StoryResultFormatter.wrapResult(sb.toString(), true);

app/src/main/java/com/microsoft/office365/snippetapp/Interfaces/O365Operations.java

@@ -6,8 +6,8 @@
 
 import android.view.View;
 
-import com.microsoft.services.files.fetchers.FilesClient;
-import com.microsoft.services.outlook.fetchers.OutlookClient;
+import com.microsoft.fileservices.odata.SharePointClient;
+import com.microsoft.outlookservices.odata.OutlookClient;
 
 public interface O365Operations {
     public void connectToO365();
@@ -20,7 +20,7 @@ public interface O365Operations {
 
     public String getMailServiceResourceId();
 
-    public FilesClient getO365MyFilesClient();
+    public SharePointClient getO365MyFilesClient();
 
     public String getMyFilesServiceResourceId();
 

app/src/main/java/com/microsoft/office365/snippetapp/ODataStories/ODataFilterStory.java

@@ -9,10 +9,10 @@
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.BaseUserStory;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.BodyType;
-import com.microsoft.services.outlook.Event;
-import com.microsoft.services.outlook.Importance;
-import com.microsoft.services.outlook.ItemBody;
+import com.microsoft.outlookservices.BodyType;
+import com.microsoft.outlookservices.Event;
+import com.microsoft.outlookservices.Importance;
+import com.microsoft.outlookservices.ItemBody;
 
 import java.util.Calendar;
 import java.util.List;

app/src/main/java/com/microsoft/office365/snippetapp/ODataStories/ODataSelectStory.java

@@ -10,7 +10,7 @@
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.BaseUserStory;
 import com.microsoft.office365.snippetapp.helpers.StoryResultFormatter;
-import com.microsoft.services.outlook.Message;
+import com.microsoft.outlookservices.Message;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

app/src/main/java/com/microsoft/office365/snippetapp/OperationListActivity.java

@@ -20,16 +20,15 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.SettableFuture;
 import com.microsoft.aad.adal.AuthenticationResult;
-import com.microsoft.services.discovery.ServiceInfo;
-import com.microsoft.services.files.fetchers.FilesClient;
+import com.microsoft.discoveryservices.ServiceInfo;
+import com.microsoft.fileservices.odata.SharePointClient;
 import com.microsoft.office365.snippetapp.Interfaces.O365Operations;
 import com.microsoft.office365.snippetapp.helpers.AuthUtil;
 import com.microsoft.office365.snippetapp.helpers.AuthenticationController;
 import com.microsoft.office365.snippetapp.helpers.Constants;
 import com.microsoft.office365.snippetapp.helpers.DiscoveryController;
 import com.microsoft.office365.snippetapp.helpers.GlobalValues;
-import com.microsoft.services.orc.core.DependencyResolver;
-import com.microsoft.services.outlook.fetchers.OutlookClient;
+import com.microsoft.outlookservices.odata.OutlookClient;
 import com.microsoft.services.odata.impl.ADALDependencyResolver;
 
 import java.net.URI;
@@ -46,7 +45,7 @@ public class OperationListActivity extends Activity
     public static final int SIGNOUT_MENU_ITEM = 2;
     private static final String TAG = "OperationListActivity";
     public OutlookClient mOutlookClient;
-    public FilesClient mMyFilesClient;
+    public SharePointClient mMyFilesClient;
     private String mMailServiceResourceId;
     private String mMailServiceEndpointUri;
     private String mMyFilesServiceEndpointUri;
@@ -240,7 +239,7 @@ public String getMailServiceResourceId() {
     }
 
     @Override
-    public FilesClient getO365MyFilesClient() {
+    public SharePointClient getO365MyFilesClient() {
         return mMyFilesClient;
     }
 
@@ -272,20 +271,20 @@ public void onSuccess(ServiceInfo serviceInfo) {
                         showDiscoverSuccessUI();
 
                         mMyFilesServiceResourceId =
-                                serviceInfo.getServiceResourceId();
+                                serviceInfo.getserviceResourceId();
 
                         mMyFilesServiceEndpointUri =
-                                serviceInfo.getServiceEndpointUri();
+                                serviceInfo.getserviceEndpointUri();
 
                         AuthenticationController.getInstance()
                                 .setResourceId(mMyFilesServiceResourceId);
                         ADALDependencyResolver dependencyResolver = (ADALDependencyResolver) AuthenticationController
                                 .getInstance()
                                 .getDependencyResolver();
 
-                        mMyFilesClient = new FilesClient(
+                        mMyFilesClient = new SharePointClient(
                                 mMyFilesServiceEndpointUri,
-                                (DependencyResolver) dependencyResolver
+                                dependencyResolver
                         );
 
                         //User is connected, SharePoint client endpoint is found
@@ -328,10 +327,10 @@ public void onSuccess(ServiceInfo serviceInfo) {
                         showDiscoverSuccessUI();
 
                         mMailServiceResourceId =
-                                serviceInfo.getServiceResourceId();
+                                serviceInfo.getserviceResourceId();
 
                         mMailServiceEndpointUri =
-                                serviceInfo.getServiceEndpointUri();
+                                serviceInfo.getserviceEndpointUri();
 
                         lazyMailClientGetter();
                         enableListClick();
@@ -360,7 +359,7 @@ private void lazyMailClientGetter() {
         AuthenticationController.getInstance()
                 .setResourceId(mMailServiceResourceId);
 
-        DependencyResolver dependencyResolver = (DependencyResolver) AuthenticationController
+        ADALDependencyResolver dependencyResolver = (ADALDependencyResolver) AuthenticationController
                 .getInstance()
                 .getDependencyResolver();
         if (mOutlookClient == null) {

app/src/main/java/com/microsoft/office365/snippetapp/Snippets/CalendarSnippets.java

@@ -5,21 +5,20 @@
 
 import android.util.Patterns;
 
-
-import com.microsoft.services.outlook.Attendee;
-import com.microsoft.services.outlook.BodyType;
-import com.microsoft.services.outlook.DayOfWeek;
-import com.microsoft.services.outlook.EmailAddress;
-import com.microsoft.services.outlook.Event;
-import com.microsoft.services.outlook.ItemBody;
-import com.microsoft.services.outlook.PatternedRecurrence;
-import com.microsoft.services.outlook.RecurrencePattern;
-import com.microsoft.services.outlook.RecurrencePatternType;
-import com.microsoft.services.outlook.RecurrenceRange;
-import com.microsoft.services.outlook.RecurrenceRangeType;
-import com.microsoft.services.outlook.ResponseStatus;
-import com.microsoft.services.outlook.ResponseType;
-import com.microsoft.services.outlook.fetchers.OutlookClient;
+import com.microsoft.outlookservices.Attendee;
+import com.microsoft.outlookservices.BodyType;
+import com.microsoft.outlookservices.DayOfWeek;
+import com.microsoft.outlookservices.EmailAddress;
+import com.microsoft.outlookservices.Event;
+import com.microsoft.outlookservices.ItemBody;
+import com.microsoft.outlookservices.PatternedRecurrence;
+import com.microsoft.outlookservices.RecurrencePattern;
+import com.microsoft.outlookservices.RecurrencePatternType;
+import com.microsoft.outlookservices.RecurrenceRange;
+import com.microsoft.outlookservices.RecurrenceRangeType;
+import com.microsoft.outlookservices.ResponseStatus;
+import com.microsoft.outlookservices.ResponseType;
+import com.microsoft.outlookservices.odata.OutlookClient;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeConstants;
@@ -48,7 +47,7 @@ public CalendarSnippets(OutlookClient mailClient) {
      * This snippet only selects the Subject, Start, and End fields
      * to reduce network traffic.
      *
-     * @return List. A list of the {@link com.microsoft.services.outlook.Event} objects
+     * @return List. A list of the {@link com.microsoft.outlookservices.Event} objects
      */
     public List<Event> getO365Events() throws ExecutionException, InterruptedException {
 

app/src/main/java/com/microsoft/office365/snippetapp/Snippets/ContactsSnippets.java

@@ -3,10 +3,9 @@
  */
 package com.microsoft.office365.snippetapp.Snippets;
 
-
-import com.microsoft.services.outlook.Contact;
-import com.microsoft.services.outlook.EmailAddress;
-import com.microsoft.services.outlook.fetchers.OutlookClient;
+import com.microsoft.outlookservices.Contact;
+import com.microsoft.outlookservices.EmailAddress;
+import com.microsoft.outlookservices.odata.OutlookClient;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/microsoft/office365/snippetapp/Snippets/EmailSnippets.java

@@ -5,18 +5,17 @@
 package com.microsoft.office365.snippetapp.Snippets;
 
 import com.microsoft.office365.snippetapp.AndroidSnippetsApplication;
-import com.microsoft.services.outlook.Attachment;
-import com.microsoft.services.outlook.BodyType;
-import com.microsoft.services.outlook.EmailAddress;
-import com.microsoft.services.outlook.FileAttachment;
-import com.microsoft.services.outlook.Folder;
-import com.microsoft.services.outlook.Item;
-import com.microsoft.services.outlook.ItemAttachment;
-import com.microsoft.services.outlook.ItemBody;
-import com.microsoft.services.outlook.Message;
-import com.microsoft.services.outlook.Recipient;
-import com.microsoft.services.outlook.fetchers.OutlookClient;
-
+import com.microsoft.outlookservices.Attachment;
+import com.microsoft.outlookservices.BodyType;
+import com.microsoft.outlookservices.EmailAddress;
+import com.microsoft.outlookservices.FileAttachment;
+import com.microsoft.outlookservices.Folder;
+import com.microsoft.outlookservices.Item;
+import com.microsoft.outlookservices.ItemAttachment;
+import com.microsoft.outlookservices.ItemBody;
+import com.microsoft.outlookservices.Message;
+import com.microsoft.outlookservices.Recipient;
+import com.microsoft.outlookservices.odata.OutlookClient;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;