diff --git a/O365-auth/src/main/java/com/microsoft/AuthenticationManager.java b/O365-auth/src/main/java/com/microsoft/AuthenticationManager.java index 32ba4d7..8aac5f3 100644 --- a/O365-auth/src/main/java/com/microsoft/AuthenticationManager.java +++ b/O365-auth/src/main/java/com/microsoft/AuthenticationManager.java @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. - * See full license at the bottom of this file. + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. */ package com.microsoft; @@ -146,31 +146,3 @@ private void removeUserId() { } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/O365-auth/src/main/java/com/microsoft/AzureADModule.java b/O365-auth/src/main/java/com/microsoft/AzureADModule.java index 2e5e230..04c4692 100644 --- a/O365-auth/src/main/java/com/microsoft/AzureADModule.java +++ b/O365-auth/src/main/java/com/microsoft/AzureADModule.java @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. - * See full license at the bottom of this file. + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. */ package com.microsoft; @@ -129,31 +129,3 @@ public AuthenticationManager providesAuthenticationManager( } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/O365-auth/src/main/java/com/microsoft/AzureAppCompatActivity.java b/O365-auth/src/main/java/com/microsoft/AzureAppCompatActivity.java index 4ef1266..b35132a 100644 --- a/O365-auth/src/main/java/com/microsoft/AzureAppCompatActivity.java +++ b/O365-auth/src/main/java/com/microsoft/AzureAppCompatActivity.java @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. - * See full license at the bottom of this file. + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. */ package com.microsoft; @@ -55,31 +55,3 @@ protected ObjectGraph getRootGraph() { } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 82f8293..6e4e8c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,6 +23,7 @@ android { } } + dependencies { // Support libs compile 'com.android.support:appcompat-v7:22.1.1' @@ -33,7 +34,7 @@ dependencies { } // MSA Authentication - compile 'com.microsoft.orc:live-auth:0.14.2' + compile 'com.microsoft.services.msa:msa-auth:0.8.4' // Dagger compiler for DI annotation support provided 'com.squareup.dagger:dagger-compiler:1.2.2' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c07a666..1945891 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,8 @@ android:theme="@style/AppTheme"> + android:label="@string/app_name" + android:screenOrientation="portrait"> diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/BaseActivity.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/BaseActivity.java index 8d292f5..0162751 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/BaseActivity.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/BaseActivity.java @@ -1,17 +1,17 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest; import com.microsoft.AzureADModule; import com.microsoft.AzureAppCompatActivity; -import com.microsoft.live.LiveAuthClient; import com.microsoft.o365_android_onenote_rest.application.SnippetApp; import com.microsoft.o365_android_onenote_rest.conf.ServiceConstants; import com.microsoft.o365_android_onenote_rest.inject.AzureModule; import com.microsoft.o365_android_onenote_rest.inject.ObjectGraphInjector; import com.microsoft.o365_android_onenote_rest.model.Scope; +import com.microsoft.services.msa.LiveAuthClient; import java.util.ArrayList; @@ -65,31 +65,3 @@ public void inject(Object target) { mObjectGraph.inject(target); } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/BaseFragment.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/BaseFragment.java index d6f2241..a598181 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/BaseFragment.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/BaseFragment.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest; import android.os.Bundle; @@ -17,31 +17,3 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) { } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/SignInActivity.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/SignInActivity.java index 930d10d..aeab2ea 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/SignInActivity.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/SignInActivity.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest; import android.content.Intent; @@ -9,13 +10,13 @@ import com.microsoft.aad.adal.AuthenticationCallback; import com.microsoft.aad.adal.AuthenticationResult; -import com.microsoft.live.LiveAuthException; -import com.microsoft.live.LiveAuthListener; -import com.microsoft.live.LiveConnectSession; -import com.microsoft.live.LiveStatus; import com.microsoft.o365_android_onenote_rest.conf.ServiceConstants; import com.microsoft.o365_android_onenote_rest.util.SharedPrefsUtil; import com.microsoft.o365_android_onenote_rest.util.User; +import com.microsoft.services.msa.LiveAuthException; +import com.microsoft.services.msa.LiveAuthListener; +import com.microsoft.services.msa.LiveConnectSession; +import com.microsoft.services.msa.LiveStatus; import java.net.URI; import java.util.UUID; @@ -29,16 +30,53 @@ public class SignInActivity extends BaseActivity - implements AuthenticationCallback, LiveAuthListener { + implements AuthenticationCallback { + + protected final LiveAuthListener mLiveAuthListener = new LiveAuthListener() { + + @Override + public void onAuthComplete(LiveStatus status, + LiveConnectSession session, + Object userState) { + Timber.d("MSA: Auth Complete..."); + if (null != status) { + Timber.d(status.toString()); + } + if (null != session) { + Timber.d(session.toString()); + SharedPrefsUtil.persistAuthToken(session); + } + if (null != userState) { + Timber.d(userState.toString()); + } + if (status == LiveStatus.CONNECTED) { + start(); + } + } + + @Override + public void onAuthError(LiveAuthException exception, Object userState) { + exception.printStackTrace(); + } + }; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_signin); + boolean authSuccess = false; if (User.isOrg()) { mAuthenticationManager.connect(this); + } else if (authSuccess = (User.isMsa() + // this check has side effects: see mLiveAuthListener implementation + && mLiveAuthClient.loginSilent(mLiveAuthListener))) { + // callback will be fired, do not inject ButterKnife + return; + } + + if (!authSuccess) { + ButterKnife.inject(this); } - ButterKnife.inject(this); } @OnClick(o365_signin) @@ -91,7 +129,7 @@ public void onSignInMsaClicked() { private void authenticateMsa() { try { validateMsaArgs(); - mLiveAuthClient.login(this, sSCOPES, this); + mLiveAuthClient.login(this, sSCOPES, mLiveAuthListener); } catch (IllegalArgumentException e) { warnBadClient(); } @@ -105,12 +143,12 @@ private void validateMsaArgs() throws IllegalArgumentException { @Override public void onSuccess(AuthenticationResult authenticationResult) { - finish(); SharedPrefsUtil.persistAuthToken(authenticationResult); start(); } private void start() { + finish(); Intent appLaunch = new Intent(this, SnippetListActivity.class); startActivity(appLaunch); } @@ -124,55 +162,4 @@ public void onError(Exception e) { } Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); } - - @Override - public void onAuthComplete(LiveStatus status, - LiveConnectSession session, - Object userState) { - Timber.d("MSA: Auth Complete..."); - if (null != status) { - Timber.d(status.toString()); - } - if (null != session) { - Timber.d(session.toString()); - SharedPrefsUtil.persistAuthToken(session); - } - if (null != userState) { - Timber.d(userState.toString()); - } - start(); - } - - @Override - public void onAuthError(LiveAuthException exception, Object userState) { - exception.printStackTrace(); - } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetDetailActivity.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetDetailActivity.java index b4a0c8f..0e3ebaf 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetDetailActivity.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetDetailActivity.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest; import android.content.Intent; @@ -8,7 +9,6 @@ import android.support.v4.app.NavUtils; import android.view.MenuItem; - public class SnippetDetailActivity extends BaseActivity { @Override @@ -40,31 +40,3 @@ public boolean onOptionsItemSelected(MenuItem item) { return super.onOptionsItemSelected(item); } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetDetailFragment.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetDetailFragment.java index 593e37e..0b2ef3c 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetDetailFragment.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetDetailFragment.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest; import android.annotation.TargetApi; @@ -30,11 +31,6 @@ import com.microsoft.AuthenticationManager; import com.microsoft.aad.adal.AuthenticationCallback; import com.microsoft.aad.adal.AuthenticationResult; -import com.microsoft.live.LiveAuthClient; -import com.microsoft.live.LiveAuthException; -import com.microsoft.live.LiveAuthListener; -import com.microsoft.live.LiveConnectSession; -import com.microsoft.live.LiveStatus; import com.microsoft.o365_android_onenote_rest.snippet.AbstractSnippet; import com.microsoft.o365_android_onenote_rest.snippet.Callback; import com.microsoft.o365_android_onenote_rest.snippet.Input; @@ -42,6 +38,11 @@ import com.microsoft.o365_android_onenote_rest.util.SharedPrefsUtil; import com.microsoft.o365_android_onenote_rest.util.User; import com.microsoft.onenotevos.BaseVO; +import com.microsoft.services.msa.LiveAuthClient; +import com.microsoft.services.msa.LiveAuthException; +import com.microsoft.services.msa.LiveAuthListener; +import com.microsoft.services.msa.LiveConnectSession; +import com.microsoft.services.msa.LiveStatus; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringEscapeUtils; @@ -457,7 +458,7 @@ public Map getParams() { } @Override - public void onSuccess(AuthenticationResult authenticationResult) { + public void onSuccess(final AuthenticationResult authenticationResult) { SharedPrefsUtil.persistAuthToken(authenticationResult); ready(); } @@ -491,43 +492,29 @@ public void onClick(DialogInterface dialog, int which) { } @Override - public void onAuthComplete(LiveStatus status, LiveConnectSession session, Object userState) { - if (null != session) { - SharedPrefsUtil.persistAuthToken(session); + public void onAuthComplete(LiveStatus status, final LiveConnectSession session, Object userState) { + if (null != getActivity()) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + if (null != session) { + SharedPrefsUtil.persistAuthToken(session); + } + ready(); + } + }); } - ready(); } @Override - public void onAuthError(LiveAuthException exception, Object userState) { - onError(exception); + public void onAuthError(final LiveAuthException exception, Object userState) { + if (null != getActivity()) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + onError(exception); + } + }); + } } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListActivity.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListActivity.java index 4a42d9c..e087dd6 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListActivity.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListActivity.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest; import android.content.Context; @@ -77,31 +78,3 @@ public void onDisconnectClicked() { startActivity(login); } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListAdapter.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListAdapter.java index b343170..f478c47 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListAdapter.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListAdapter.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest; import android.content.Context; @@ -83,31 +84,3 @@ private boolean isWrongViewType(boolean isSegment, View convertView) { } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListFragment.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListFragment.java index e20b351..8055919 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListFragment.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetListFragment.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest; import android.app.Activity; @@ -126,31 +126,3 @@ private void setActivatedPosition(int position) { mActivatedPosition = position; } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/application/SnippetApp.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/application/SnippetApp.java index 26df966..d63c1e7 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/application/SnippetApp.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/application/SnippetApp.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.application; import android.app.Application; @@ -65,31 +65,3 @@ public RestAdapter getRestAdapter() { .build(); } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/AppModule.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/AppModule.java index 1b41720..4ebbaae 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/AppModule.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/AppModule.java @@ -1,17 +1,18 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.inject; import android.content.Context; import android.content.SharedPreferences; -import com.microsoft.live.LiveAuthClient; +import com.microsoft.o365_android_onenote_rest.BaseActivity; import com.microsoft.o365_android_onenote_rest.application.SnippetApp; import com.microsoft.o365_android_onenote_rest.conf.ServiceConstants; import com.microsoft.o365_android_onenote_rest.util.SharedPrefsUtil; import com.microsoft.onenoteapi.service.GsonDateTime; +import com.microsoft.services.msa.LiveAuthClient; import javax.inject.Singleton; @@ -67,34 +68,10 @@ public void intercept(RequestFacade request) { @Provides @Singleton public LiveAuthClient providesLiveAuthClient() { - return new LiveAuthClient(SnippetApp.getApp(), ServiceConstants.MSA_CLIENT_ID); + return new LiveAuthClient( + SnippetApp.getApp(), + ServiceConstants.MSA_CLIENT_ID, + BaseActivity.sSCOPES + ); } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/AzureModule.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/AzureModule.java index cd25f49..90c225d 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/AzureModule.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/AzureModule.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.inject; import com.microsoft.AzureADModule; @@ -20,33 +21,4 @@ SnippetDetailFragment.class } ) -public class AzureModule { -} -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file +public class AzureModule {} diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/ObjectGraphInjector.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/ObjectGraphInjector.java index 5cdb7ec..3d8524c 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/ObjectGraphInjector.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/ObjectGraphInjector.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.inject; public interface ObjectGraphInjector { @@ -9,31 +9,3 @@ public interface ObjectGraphInjector { void inject(Object target); } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/model/Scope.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/model/Scope.java index b41793f..fe52f25 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/model/Scope.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/model/Scope.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.model; import com.microsoft.o365_android_onenote_rest.application.SnippetApp; @@ -60,31 +61,3 @@ private static String getString(int res) { return SnippetApp.getApp().getString(res); } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/AbstractSnippet.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/AbstractSnippet.java index 9eaec03..ab3b24f 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/AbstractSnippet.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/AbstractSnippet.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.snippet; import com.microsoft.o365_android_onenote_rest.application.SnippetApp; @@ -167,31 +167,3 @@ public String getSection() { public abstract void request(Service service, Callback callback); } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/Callback.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/Callback.java index 3272221..06eee8a 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/Callback.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/Callback.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.snippet; import java.util.Map; @@ -9,31 +10,3 @@ public interface Callback extends retrofit.Callback { Map getParams(); } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/Input.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/Input.java index afde666..2980bcd 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/Input.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/Input.java @@ -1,36 +1,9 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.snippet; public enum Input { None, Text, Spinner, Both } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/NotebookSnippet.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/NotebookSnippet.java index 1e776f5..e129e1d 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/NotebookSnippet.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/NotebookSnippet.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.snippet; import com.google.gson.JsonObject; @@ -281,31 +281,3 @@ public Map getParams() { } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/PagesSnippet.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/PagesSnippet.java index d30fcc9..21fad49 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/PagesSnippet.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/PagesSnippet.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.snippet; import com.google.gson.JsonArray; @@ -930,31 +930,3 @@ public Map getParams() { } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SectionGroupSnippet.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SectionGroupSnippet.java index 8b71ef4..ef97500 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SectionGroupSnippet.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SectionGroupSnippet.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.snippet; import com.google.gson.JsonObject; @@ -269,31 +269,3 @@ public Map getParams() { } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SectionSnippet.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SectionSnippet.java index 0def809..896746c 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SectionSnippet.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SectionSnippet.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.snippet; import com.google.gson.JsonObject; @@ -356,31 +356,3 @@ public Map getParams() { } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SnippetCategory.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SnippetCategory.java index 0e457d5..718720e 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SnippetCategory.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SnippetCategory.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.snippet; import com.microsoft.o365_android_onenote_rest.application.SnippetApp; @@ -40,31 +40,3 @@ private static T create(Class clazz) { return SnippetApp.getApp().getRestAdapter().create(clazz); } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SnippetContent.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SnippetContent.java index 9522594..4cf46c3 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SnippetContent.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/snippet/SnippetContent.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.snippet; import java.util.ArrayList; @@ -31,31 +31,3 @@ public class SnippetContent { } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/util/SharedPrefsUtil.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/util/SharedPrefsUtil.java index d74d9fb..8a562eb 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/util/SharedPrefsUtil.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/util/SharedPrefsUtil.java @@ -1,15 +1,16 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.util; import android.content.Context; import android.content.SharedPreferences; import com.microsoft.aad.adal.AuthenticationResult; -import com.microsoft.live.LiveConnectSession; import com.microsoft.o365_android_onenote_rest.application.SnippetApp; import com.microsoft.o365_android_onenote_rest.inject.AppModule; +import com.microsoft.services.msa.LiveConnectSession; public class SharedPrefsUtil { @@ -33,31 +34,3 @@ private static void setAccessToken(String accessToken) { getSharedPreferences().edit().putString(PREF_AUTH_TOKEN, accessToken).commit(); } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/app/src/main/java/com/microsoft/o365_android_onenote_rest/util/User.java b/app/src/main/java/com/microsoft/o365_android_onenote_rest/util/User.java index 37f5c23..549f48a 100644 --- a/app/src/main/java/com/microsoft/o365_android_onenote_rest/util/User.java +++ b/app/src/main/java/com/microsoft/o365_android_onenote_rest/util/User.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.o365_android_onenote_rest.util; public class User { @@ -36,31 +37,3 @@ private static void set(String which, boolean state) { .commit(); } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/DateTimeDeserializer.java b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/DateTimeDeserializer.java index ebd7d45..5297271 100644 --- a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/DateTimeDeserializer.java +++ b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/DateTimeDeserializer.java @@ -1,5 +1,6 @@ /* - * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. */ package com.microsoft.onenoteapi.service; @@ -18,32 +19,3 @@ public DateTime deserialize(JsonElement json, Type typeOfT, JsonDeserializationC return new DateTime(json.getAsJsonPrimitive().getAsString()); } } - -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/DateTimeSerializer.java b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/DateTimeSerializer.java index 9b8a4b2..84cd3d4 100644 --- a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/DateTimeSerializer.java +++ b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/DateTimeSerializer.java @@ -1,5 +1,6 @@ /* - * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. */ package com.microsoft.onenoteapi.service; @@ -17,32 +18,3 @@ public JsonElement serialize(DateTime src, Type typeOfSrc, JsonSerializationCont return new JsonPrimitive(src.toString()); } } - -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/GsonDateTime.java b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/GsonDateTime.java index 9747eef..caf20ad 100644 --- a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/GsonDateTime.java +++ b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/GsonDateTime.java @@ -1,5 +1,6 @@ /* - * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. */ package com.microsoft.onenoteapi.service; @@ -15,33 +16,4 @@ public static GsonBuilder getOneNoteBuilder() { gsonBuilder.registerTypeAdapter(DateTime.class, new DateTimeDeserializer()); return gsonBuilder; } - } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/NotebooksService.java b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/NotebooksService.java index 2efef04..fcfd25e 100644 --- a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/NotebooksService.java +++ b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/NotebooksService.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenoteapi.service; import com.microsoft.onenotevos.Envelope; @@ -97,31 +97,3 @@ void postNotebook( Callback> callback ); } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/OneNotePartsMap.java b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/OneNotePartsMap.java index 228bb0d..d6e516a 100644 --- a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/OneNotePartsMap.java +++ b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/OneNotePartsMap.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenoteapi.service; import java.util.HashMap; @@ -17,31 +18,3 @@ public OneNotePartsMap(TypedInput initValue) { } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/PagesService.java b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/PagesService.java index 9561946..38331da 100644 --- a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/PagesService.java +++ b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/PagesService.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenoteapi.service; import com.microsoft.onenotevos.Envelope; @@ -190,31 +190,3 @@ void patchPage( Callback> callback ); } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* diff --git a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/PatchCommand.java b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/PatchCommand.java index 8ca38cd..c7fd919 100644 --- a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/PatchCommand.java +++ b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/PatchCommand.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenoteapi.service; import android.util.Log; @@ -33,31 +34,3 @@ public JsonElement serialize(PatchCommand patchCommand, return result; } } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/SectionGroupsService.java b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/SectionGroupsService.java index a6b402a..97bb0fc 100644 --- a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/SectionGroupsService.java +++ b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/SectionGroupsService.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenoteapi.service; import com.microsoft.onenotevos.Envelope; @@ -91,31 +91,3 @@ void postSectionGroupInSectionGroup( Callback> callback ); } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/SectionsService.java b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/SectionsService.java index a835130..bff2567 100644 --- a/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/SectionsService.java +++ b/onenoteapi/src/main/java/com/microsoft/onenoteapi/service/SectionsService.java @@ -1,8 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenoteapi.service; import com.microsoft.onenotevos.Envelope; @@ -121,31 +120,3 @@ void deleteSection( ); } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenotevos/src/main/java/com/microsoft/onenotevos/BaseVO.java b/onenotevos/src/main/java/com/microsoft/onenotevos/BaseVO.java index ac0a647..269a6d2 100644 --- a/onenotevos/src/main/java/com/microsoft/onenotevos/BaseVO.java +++ b/onenotevos/src/main/java/com/microsoft/onenotevos/BaseVO.java @@ -1,7 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenotevos; import com.google.gson.annotations.SerializedName; @@ -37,31 +37,3 @@ public abstract class BaseVO { public String userRole; } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenotevos/src/main/java/com/microsoft/onenotevos/Envelope.java b/onenotevos/src/main/java/com/microsoft/onenotevos/Envelope.java index fe29372..827a2e0 100644 --- a/onenotevos/src/main/java/com/microsoft/onenotevos/Envelope.java +++ b/onenotevos/src/main/java/com/microsoft/onenotevos/Envelope.java @@ -1,37 +1,9 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ - + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenotevos; public class Envelope extends BaseVO { public T[] value; } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenotevos/src/main/java/com/microsoft/onenotevos/Links.java b/onenotevos/src/main/java/com/microsoft/onenotevos/Links.java index 5bb8876..07f335f 100644 --- a/onenotevos/src/main/java/com/microsoft/onenotevos/Links.java +++ b/onenotevos/src/main/java/com/microsoft/onenotevos/Links.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenotevos; public class Links { @@ -17,31 +18,3 @@ public static class OneNoteWebUrl extends Url {} public OneNoteClientUrl oneNoteClientUrl; public OneNoteWebUrl oneNoteWebUrl; } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* diff --git a/onenotevos/src/main/java/com/microsoft/onenotevos/Notebook.java b/onenotevos/src/main/java/com/microsoft/onenotevos/Notebook.java index 6e91cf7..f003e71 100644 --- a/onenotevos/src/main/java/com/microsoft/onenotevos/Notebook.java +++ b/onenotevos/src/main/java/com/microsoft/onenotevos/Notebook.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenotevos; public class Notebook extends BaseVO { @@ -9,31 +10,3 @@ public class Notebook extends BaseVO { public String sectionsUrl; } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenotevos/src/main/java/com/microsoft/onenotevos/Page.java b/onenotevos/src/main/java/com/microsoft/onenotevos/Page.java index 380b2d4..980c0e3 100644 --- a/onenotevos/src/main/java/com/microsoft/onenotevos/Page.java +++ b/onenotevos/src/main/java/com/microsoft/onenotevos/Page.java @@ -1,37 +1,10 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenotevos; public class Page extends BaseVO { public String title; public String contentUrl; } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenotevos/src/main/java/com/microsoft/onenotevos/Section.java b/onenotevos/src/main/java/com/microsoft/onenotevos/Section.java index 3550889..e97eaba 100644 --- a/onenotevos/src/main/java/com/microsoft/onenotevos/Section.java +++ b/onenotevos/src/main/java/com/microsoft/onenotevos/Section.java @@ -1,6 +1,7 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenotevos; import com.google.gson.annotations.SerializedName; @@ -18,31 +19,3 @@ public class Section extends BaseVO { public String parentNotebook_odata_context; } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// ********************************************************* \ No newline at end of file diff --git a/onenotevos/src/main/java/com/microsoft/onenotevos/SectionGroup.java b/onenotevos/src/main/java/com/microsoft/onenotevos/SectionGroup.java index df2b426..7c72731 100644 --- a/onenotevos/src/main/java/com/microsoft/onenotevos/SectionGroup.java +++ b/onenotevos/src/main/java/com/microsoft/onenotevos/SectionGroup.java @@ -1,36 +1,9 @@ /* -* Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license at the bottom of this file. -*/ + * Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. + * See LICENSE in the project root for license information. + */ package com.microsoft.onenotevos; public class SectionGroup extends BaseVO { public String pagesUrl; } -// ********************************************************* -// -// Android-REST-API-Explorer, https://github.com/OneNoteDev/Android-REST-API-Explorer -// -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License: -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// *********************************************************