Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit da22261

Browse files
author
Brian Melton
committed
Integrating new msa
1 parent f7f37a0 commit da22261

File tree

7 files changed

+52
-27
lines changed

7 files changed

+52
-27
lines changed

‎app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ android {
2323
}
2424
}
2525

26+
2627
dependencies {
2728
// Support libs
2829
compile 'com.android.support:appcompat-v7:22.1.1'
@@ -33,7 +34,7 @@ dependencies {
3334
}
3435

3536
// MSA Authentication
36-
compile 'com.microsoft.orc:live-auth:0.14.2'
37+
compile 'com.microsoft.services.msa:msa-auth:0.8.4'
3738

3839
// Dagger compiler for DI annotation support
3940
provided 'com.squareup.dagger:dagger-compiler:1.2.2'

‎app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
android:theme="@style/AppTheme">
1111
<activity
1212
android:name=".SignInActivity"
13-
android:label="@string/app_name">
13+
android:label="@string/app_name"
14+
android:screenOrientation="portrait">
1415
<intent-filter>
1516
<action android:name="android.intent.action.MAIN" />
1617

‎app/src/main/java/com/microsoft/o365_android_onenote_rest/BaseActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
import com.microsoft.AzureADModule;
88
import com.microsoft.AzureAppCompatActivity;
9-
import com.microsoft.live.LiveAuthClient;
109
import com.microsoft.o365_android_onenote_rest.application.SnippetApp;
1110
import com.microsoft.o365_android_onenote_rest.conf.ServiceConstants;
1211
import com.microsoft.o365_android_onenote_rest.inject.AzureModule;
1312
import com.microsoft.o365_android_onenote_rest.inject.ObjectGraphInjector;
1413
import com.microsoft.o365_android_onenote_rest.model.Scope;
14+
import com.microsoft.services.msa.LiveAuthClient;
1515

1616
import java.util.ArrayList;
1717

‎app/src/main/java/com/microsoft/o365_android_onenote_rest/SignInActivity.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99

1010
import com.microsoft.aad.adal.AuthenticationCallback;
1111
import com.microsoft.aad.adal.AuthenticationResult;
12-
import com.microsoft.live.LiveAuthException;
13-
import com.microsoft.live.LiveAuthListener;
14-
import com.microsoft.live.LiveConnectSession;
15-
import com.microsoft.live.LiveStatus;
1612
import com.microsoft.o365_android_onenote_rest.conf.ServiceConstants;
1713
import com.microsoft.o365_android_onenote_rest.util.SharedPrefsUtil;
1814
import com.microsoft.o365_android_onenote_rest.util.User;
15+
import com.microsoft.services.msa.LiveAuthException;
16+
import com.microsoft.services.msa.LiveAuthListener;
17+
import com.microsoft.services.msa.LiveConnectSession;
18+
import com.microsoft.services.msa.LiveStatus;
1919

2020
import java.net.URI;
2121
import java.util.UUID;
@@ -126,9 +126,9 @@ public void onError(Exception e) {
126126
}
127127

128128
@Override
129-
public void onAuthComplete(LiveStatus status,
130-
LiveConnectSession session,
131-
Object userState) {
129+
public void onAuthComplete(final LiveStatus status,
130+
final LiveConnectSession session,
131+
final Object userState) {
132132
Timber.d("MSA: Auth Complete...");
133133
if (null != status) {
134134
Timber.d(status.toString());
@@ -140,7 +140,9 @@ public void onAuthComplete(LiveStatus status,
140140
if (null != userState) {
141141
Timber.d(userState.toString());
142142
}
143-
start();
143+
if (status == LiveStatus.CONNECTED) {
144+
start();
145+
}
144146
}
145147

146148
@Override

‎app/src/main/java/com/microsoft/o365_android_onenote_rest/SnippetDetailFragment.java

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@
3030
import com.microsoft.AuthenticationManager;
3131
import com.microsoft.aad.adal.AuthenticationCallback;
3232
import com.microsoft.aad.adal.AuthenticationResult;
33-
import com.microsoft.live.LiveAuthClient;
34-
import com.microsoft.live.LiveAuthException;
35-
import com.microsoft.live.LiveAuthListener;
36-
import com.microsoft.live.LiveConnectSession;
37-
import com.microsoft.live.LiveStatus;
3833
import com.microsoft.o365_android_onenote_rest.snippet.AbstractSnippet;
3934
import com.microsoft.o365_android_onenote_rest.snippet.Callback;
4035
import com.microsoft.o365_android_onenote_rest.snippet.Input;
4136
import com.microsoft.o365_android_onenote_rest.snippet.SnippetContent;
4237
import com.microsoft.o365_android_onenote_rest.util.SharedPrefsUtil;
4338
import com.microsoft.o365_android_onenote_rest.util.User;
4439
import com.microsoft.onenotevos.BaseVO;
40+
import com.microsoft.services.msa.LiveAuthClient;
41+
import com.microsoft.services.msa.LiveAuthException;
42+
import com.microsoft.services.msa.LiveAuthListener;
43+
import com.microsoft.services.msa.LiveConnectSession;
44+
import com.microsoft.services.msa.LiveStatus;
4545

4646
import org.apache.commons.io.IOUtils;
4747
import org.apache.commons.lang3.StringEscapeUtils;
@@ -457,9 +457,16 @@ public Map<String, String> getParams() {
457457
}
458458

459459
@Override
460-
public void onSuccess(AuthenticationResult authenticationResult) {
461-
SharedPrefsUtil.persistAuthToken(authenticationResult);
462-
ready();
460+
public void onSuccess(final AuthenticationResult authenticationResult) {
461+
if (null != getActivity()) {
462+
getActivity().runOnUiThread(new Runnable() {
463+
@Override
464+
public void run() {
465+
SharedPrefsUtil.persistAuthToken(authenticationResult);
466+
ready();
467+
}
468+
});
469+
}
463470
}
464471

465472
private void ready() {
@@ -491,16 +498,30 @@ public void onClick(DialogInterface dialog, int which) {
491498
}
492499

493500
@Override
494-
public void onAuthComplete(LiveStatus status, LiveConnectSession session, Object userState) {
495-
if (null != session) {
496-
SharedPrefsUtil.persistAuthToken(session);
501+
public void onAuthComplete(LiveStatus status, final LiveConnectSession session, Object userState) {
502+
if (null != getActivity()) {
503+
getActivity().runOnUiThread(new Runnable() {
504+
@Override
505+
public void run() {
506+
if (null != session) {
507+
SharedPrefsUtil.persistAuthToken(session);
508+
}
509+
ready();
510+
}
511+
});
497512
}
498-
ready();
499513
}
500514

501515
@Override
502-
public void onAuthError(LiveAuthException exception, Object userState) {
503-
onError(exception);
516+
public void onAuthError(final LiveAuthException exception, Object userState) {
517+
if (null != getActivity()) {
518+
getActivity().runOnUiThread(new Runnable() {
519+
@Override
520+
public void run() {
521+
onError(exception);
522+
}
523+
});
524+
}
504525
}
505526
}
506527
// *********************************************************

‎app/src/main/java/com/microsoft/o365_android_onenote_rest/inject/AppModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import android.content.Context;
88
import android.content.SharedPreferences;
99

10-
import com.microsoft.live.LiveAuthClient;
1110
import com.microsoft.o365_android_onenote_rest.application.SnippetApp;
1211
import com.microsoft.o365_android_onenote_rest.conf.ServiceConstants;
1312
import com.microsoft.o365_android_onenote_rest.util.SharedPrefsUtil;
1413
import com.microsoft.onenoteapi.service.GsonDateTime;
14+
import com.microsoft.services.msa.LiveAuthClient;
1515

1616
import javax.inject.Singleton;
1717

‎app/src/main/java/com/microsoft/o365_android_onenote_rest/util/SharedPrefsUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import android.content.SharedPreferences;
88

99
import com.microsoft.aad.adal.AuthenticationResult;
10-
import com.microsoft.live.LiveConnectSession;
1110
import com.microsoft.o365_android_onenote_rest.application.SnippetApp;
1211
import com.microsoft.o365_android_onenote_rest.inject.AppModule;
12+
import com.microsoft.services.msa.LiveConnectSession;
1313

1414
public class SharedPrefsUtil {
1515

0 commit comments

Comments
 (0)