Merged PR 9800: [Android] Make sure samples pass lint checks and enable building from the

[Android] Make sure samples pass lint checks and enable building from the Android samples root.
This commit is contained in:
Brian Bowman 2018-07-13 23:02:21 +00:00
Родитель d6a9180d2e
Коммит a843aa25a0
9 изменённых файлов: 540 добавлений и 174 удалений

Просмотреть файл

@ -4,16 +4,16 @@
package com.microsoft.connecteddevices.sampleaccountproviders;
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.net.Uri;
import android.os.Build;
import android.support.annotation.Keep;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
import android.util.Pair;
import android.webkit.WebChromeClient;
import android.webkit.WebResourceError;
import android.webkit.WebResourceRequest;
@ -28,30 +28,11 @@ import com.microsoft.connecteddevices.core.UserAccountProvider;
import com.microsoft.connecteddevices.core.UserAccount;
import com.microsoft.connecteddevices.core.UserAccountType;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.HttpsURLConnection;
/**
* Sample implementation of UserAccountProvider.
@ -274,45 +255,37 @@ public final class MSAAccountProvider implements UserAccountProvider, MSATokenCa
web.getSettings().setDomStorageEnabled(true);
web.loadUrl(signInUrl);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
web.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
if (url.startsWith(REDIRECT_URL)) {
final Uri uri = Uri.parse(url);
final String code = uri.getQueryParameter("code");
final String error = uri.getQueryParameter("error");
dialog.dismiss();
if ((error != null) || (code == null) || (code.length() <= 0)) {
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
signInOperation.complete(false);
authCodeOperation.completeExceptionally(
new Exception((error != null) ? error : "Failed to authenticate with unknown error"));
} else {
authCodeOperation.complete(code);
}
}
onSignInPageFinishedInternal(url, dialog, authCodeOperation, signInOperation);
}
@Override
@TargetApi(23)
public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
super.onReceivedError(view, request, error);
Log.e(TAG, "Encountered web resource loading error while signing in: \'" + error.getDescription() + "\'");
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
signInOperation.complete(false);
authCodeOperation.completeExceptionally(new Exception(error.getDescription().toString()));
onReceivedSignInErrorInternal(error.getDescription().toString(), authCodeOperation, signInOperation);
}
});
} else {
web.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
onSignInPageFinishedInternal(url, dialog, authCodeOperation, signInOperation);
}
@Override
public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
super.onReceivedError(view, errorCode, description, failingUrl);
onReceivedSignInErrorInternal(description, authCodeOperation, signInOperation);
}
});
}
authCodeOperation // chain after successfully fetching the authcode (does not execute if authCodeOperation completed exceptionally)
.thenComposeAsync(new AsyncOperation.ResultFunction<String, AsyncOperation<MSATokenRequest.Result>>() {
@ -364,42 +337,37 @@ public final class MSAAccountProvider implements UserAccountProvider, MSATokenCa
WebView web = (WebView)dialog.findViewById(R.id.webv);
web.loadUrl(signOutUrl);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
web.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
if (!url.contains("oauth20_desktop.srf")) {
// finishing off loading intermediate pages,
// e.g., input username/password page, consent interrupt page, wrong username/password page etc.
// no need to handle them, return early.
return;
}
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
final Uri uri = Uri.parse(url);
final String error = uri.getQueryParameter("error");
if (error != null) {
Log.e(TAG, "Signed out failed with error: " + error);
}
removeAccount();
dialog.dismiss();
onSignOutPageFinishedInternal(url, dialog);
}
@Override
@TargetApi(23)
public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
super.onReceivedError(view, request, error);
Log.e(TAG, "Encountered web resource loading error while signing out: \'" + error.getDescription() + "\'");
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
onReceivedSignOutErrorInternal(error.getDescription().toString());
}
});
} else {
web.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
onSignOutPageFinishedInternal(url, dialog);
}
@Override
public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
super.onReceivedError(view, errorCode, description, failingUrl);
onReceivedSignOutErrorInternal(description);
}
});
}
}
// endregion
@ -466,4 +434,69 @@ public final class MSAAccountProvider implements UserAccountProvider, MSATokenCa
onAccessTokenError(null, null, true);
}
// endregion
// region Internal Helpers
private void onSignInPageFinishedInternal(String url, Dialog dialog, AsyncOperation<String> authCodeOperation, AsyncOperation<Boolean> signInOperation) {
if (url.startsWith(REDIRECT_URL)) {
final Uri uri = Uri.parse(url);
final String code = uri.getQueryParameter("code");
final String error = uri.getQueryParameter("error");
dialog.dismiss();
if ((error != null) || (code == null) || (code.length() <= 0)) {
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
signInOperation.complete(false);
authCodeOperation.completeExceptionally(
new Exception((error != null) ? error : "Failed to authenticate with unknown error"));
} else {
authCodeOperation.complete(code);
}
}
}
private void onReceivedSignInErrorInternal(String errorString, AsyncOperation<String> authCodeOperation, AsyncOperation<Boolean> signInOperation) {
Log.e(TAG, "Encountered web resource loading error while signing in: \'" + errorString + "\'");
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
signInOperation.complete(false);
authCodeOperation.completeExceptionally(new Exception(errorString));
}
public void onSignOutPageFinishedInternal(String url, Dialog dialog) {
if (!url.contains("oauth20_desktop.srf")) {
// finishing off loading intermediate pages,
// e.g., input username/password page, consent interrupt page, wrong username/password page etc.
// no need to handle them, return early.
return;
}
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
final Uri uri = Uri.parse(url);
final String error = uri.getQueryParameter("error");
if (error != null) {
Log.e(TAG, "Signed out failed with error: " + error);
}
removeAccount();
dialog.dismiss();
}
public void onReceivedSignOutErrorInternal(String errorString) {
Log.e(TAG, "Encountered web resource loading error while signing out: \'" + errorString + "\'");
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
}
// endregion
}

Просмотреть файл

@ -0,0 +1,29 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.google.gms:google-services:3.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
allprojects {
repositories {
jcenter()
google()
maven { url "${project.rootDir}/.packages" }
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}

Двоичные данные
Android/samples/gradle/wrapper/gradle-wrapper.jar поставляемый Normal file

Двоичный файл не отображается.

5
Android/samples/gradle/wrapper/gradle-wrapper.properties поставляемый Normal file
Просмотреть файл

@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

172
Android/samples/gradlew поставляемый Normal file
Просмотреть файл

@ -0,0 +1,172 @@
#!/usr/bin/env sh
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@"

84
Android/samples/gradlew.bat поставляемый Normal file
Просмотреть файл

@ -0,0 +1,84 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

Просмотреть файл

@ -4,6 +4,7 @@
package com.microsoft.connecteddevices.sampleaccountproviders;
import android.annotation.TargetApi;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@ -179,6 +180,7 @@ public final class AADAccountProvider implements UserAccountProvider {
} else {
cookieManager.removeAllCookies(new ValueCallback<Boolean>() {
@Override
@TargetApi(21)
public void onReceiveValue(Boolean value) {
cookieManager.flush();
}

Просмотреть файл

@ -4,16 +4,16 @@
package com.microsoft.connecteddevices.sampleaccountproviders;
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.net.Uri;
import android.os.Build;
import android.support.annotation.Keep;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
import android.util.Pair;
import android.webkit.WebChromeClient;
import android.webkit.WebResourceError;
import android.webkit.WebResourceRequest;
@ -28,30 +28,11 @@ import com.microsoft.connecteddevices.core.UserAccountProvider;
import com.microsoft.connecteddevices.core.UserAccount;
import com.microsoft.connecteddevices.core.UserAccountType;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.HttpsURLConnection;
/**
* Sample implementation of UserAccountProvider.
@ -274,45 +255,37 @@ public final class MSAAccountProvider implements UserAccountProvider, MSATokenCa
web.getSettings().setDomStorageEnabled(true);
web.loadUrl(signInUrl);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
web.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
if (url.startsWith(REDIRECT_URL)) {
final Uri uri = Uri.parse(url);
final String code = uri.getQueryParameter("code");
final String error = uri.getQueryParameter("error");
dialog.dismiss();
if ((error != null) || (code == null) || (code.length() <= 0)) {
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
signInOperation.complete(false);
authCodeOperation.completeExceptionally(
new Exception((error != null) ? error : "Failed to authenticate with unknown error"));
} else {
authCodeOperation.complete(code);
}
}
onSignInPageFinishedInternal(url, dialog, authCodeOperation, signInOperation);
}
@Override
@TargetApi(23)
public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
super.onReceivedError(view, request, error);
Log.e(TAG, "Encountered web resource loading error while signing in: \'" + error.getDescription() + "\'");
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
signInOperation.complete(false);
authCodeOperation.completeExceptionally(new Exception(error.getDescription().toString()));
onReceivedSignInErrorInternal(error.getDescription().toString(), authCodeOperation, signInOperation);
}
});
} else {
web.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
onSignInPageFinishedInternal(url, dialog, authCodeOperation, signInOperation);
}
@Override
public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
super.onReceivedError(view, errorCode, description, failingUrl);
onReceivedSignInErrorInternal(description, authCodeOperation, signInOperation);
}
});
}
authCodeOperation // chain after successfully fetching the authcode (does not execute if authCodeOperation completed exceptionally)
.thenComposeAsync(new AsyncOperation.ResultFunction<String, AsyncOperation<MSATokenRequest.Result>>() {
@ -364,42 +337,37 @@ public final class MSAAccountProvider implements UserAccountProvider, MSATokenCa
WebView web = (WebView)dialog.findViewById(R.id.webv);
web.loadUrl(signOutUrl);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
web.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
if (!url.contains("oauth20_desktop.srf")) {
// finishing off loading intermediate pages,
// e.g., input username/password page, consent interrupt page, wrong username/password page etc.
// no need to handle them, return early.
return;
}
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
final Uri uri = Uri.parse(url);
final String error = uri.getQueryParameter("error");
if (error != null) {
Log.e(TAG, "Signed out failed with error: " + error);
}
removeAccount();
dialog.dismiss();
onSignOutPageFinishedInternal(url, dialog);
}
@Override
@TargetApi(23)
public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
super.onReceivedError(view, request, error);
Log.e(TAG, "Encountered web resource loading error while signing out: \'" + error.getDescription() + "\'");
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
onReceivedSignOutErrorInternal(error.getDescription().toString());
}
});
} else {
web.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
onSignOutPageFinishedInternal(url, dialog);
}
@Override
public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
super.onReceivedError(view, errorCode, description, failingUrl);
onReceivedSignOutErrorInternal(description);
}
});
}
}
// endregion
@ -466,4 +434,69 @@ public final class MSAAccountProvider implements UserAccountProvider, MSATokenCa
onAccessTokenError(null, null, true);
}
// endregion
// region Internal Helpers
private void onSignInPageFinishedInternal(String url, Dialog dialog, AsyncOperation<String> authCodeOperation, AsyncOperation<Boolean> signInOperation) {
if (url.startsWith(REDIRECT_URL)) {
final Uri uri = Uri.parse(url);
final String code = uri.getQueryParameter("code");
final String error = uri.getQueryParameter("error");
dialog.dismiss();
if ((error != null) || (code == null) || (code.length() <= 0)) {
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
signInOperation.complete(false);
authCodeOperation.completeExceptionally(
new Exception((error != null) ? error : "Failed to authenticate with unknown error"));
} else {
authCodeOperation.complete(code);
}
}
}
private void onReceivedSignInErrorInternal(String errorString, AsyncOperation<String> authCodeOperation, AsyncOperation<Boolean> signInOperation) {
Log.e(TAG, "Encountered web resource loading error while signing in: \'" + errorString + "\'");
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
signInOperation.complete(false);
authCodeOperation.completeExceptionally(new Exception(errorString));
}
public void onSignOutPageFinishedInternal(String url, Dialog dialog) {
if (!url.contains("oauth20_desktop.srf")) {
// finishing off loading intermediate pages,
// e.g., input username/password page, consent interrupt page, wrong username/password page etc.
// no need to handle them, return early.
return;
}
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
final Uri uri = Uri.parse(url);
final String error = uri.getQueryParameter("error");
if (error != null) {
Log.e(TAG, "Signed out failed with error: " + error);
}
removeAccount();
dialog.dismiss();
}
public void onReceivedSignOutErrorInternal(String errorString) {
Log.e(TAG, "Encountered web resource loading error while signing out: \'" + errorString + "\'");
synchronized (MSAAccountProvider.this) {
mSignInSignOutInProgress = false;
}
}
// endregion
}

Просмотреть файл

@ -0,0 +1,8 @@
include ':sdksample',
':sampleAccountProviders',
':nearsharestandalone'
project(':sdksample').projectDir = new File('sdksample/app')
project(':sampleAccountProviders').projectDir = new File('sdksample/sampleAccountProviders')
project(':nearsharestandalone').projectDir = new File('nearsharestandalone/app')