Skip to content

Remove Microsoft Duo dual-screen support #2873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshfriend wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Remove Microsoft Duo dual-screen support #2873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ dependencies {

implementation "androidx.datastore:datastore-preferences:$rootProject.ext.jetpackDataStoreVersion"

implementation(group: 'com.microsoft.device.display', name: 'display-mask', version: '0.3.0')

implementation 'org.apache.httpcomponents.core5:httpcore5:5.3'
implementation "com.nimbusds:nimbus-jose-jwt:$rootProject.ext.nimbusVersion"
implementation "androidx.activity:activity:1.8.2"
Expand Down
11 changes: 8 additions & 3 deletions ...n/java/com/microsoft/identity/common/internal/providers/oauth2/AuthorizationActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@

import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;

import com.microsoft.identity.common.internal.ui.DualScreenActivity;
import com.microsoft.identity.common.R;
import com.microsoft.identity.common.internal.util.CommonMoshiJsonAdapter;
import com.microsoft.identity.common.java.exception.TerminalException;
import com.microsoft.identity.common.java.opentelemetry.SerializableSpanContext;
Expand All @@ -44,7 +45,7 @@
import lombok.Getter;
import lombok.experimental.Accessors;

public class AuthorizationActivity extends DualScreenActivity {
public class AuthorizationActivity extends FragmentActivity {

public static final String TAG = AuthorizationActivity.class.getSimpleName();
@Getter
Expand Down Expand Up @@ -88,6 +89,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
Logger.error(methodTag, "Exception thrown during extraction: " + e.getMessage(), e);
}
}
setContentView(R.layout.common_activity_content);
final Fragment fragment = AuthorizationActivityFactory.getAuthorizationFragmentFromStartIntent(getIntent());
if (fragment instanceof AuthorizationFragment) {
mFragment = (AuthorizationFragment) fragment;
Expand All @@ -96,6 +98,9 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
final IllegalStateException ex = new IllegalStateException("Unexpected fragment type.");
Logger.error(methodTag, "Did not receive AuthorizationFragment from factory", ex);
}
setFragment(mFragment);
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.fragment_container, mFragment)
.commit();
}
}
11 changes: 8 additions & 3 deletions ...microsoft/identity/common/internal/providers/oauth2/CurrentTaskAuthorizationActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@

import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;

import com.microsoft.identity.common.internal.ui.DualScreenActivity;
import com.microsoft.identity.common.R;
import com.microsoft.identity.common.logging.Logger;

import static com.microsoft.identity.common.adal.internal.AuthenticationConstants.AuthorizationIntentAction.DESTROY_REDIRECT_RECEIVING_ACTIVITY_ACTION;
Expand All @@ -48,7 +49,7 @@
* DEFAULT today is to create a new task for authorization; however this leads to problems if the user
* navigates away during authorization (to home screen for example) or when using multi-window.
*/
public class CurrentTaskAuthorizationActivity extends DualScreenActivity {
public class CurrentTaskAuthorizationActivity extends FragmentActivity {

private static final String TAG = CurrentTaskAuthorizationActivity.class.getSimpleName();

Expand Down Expand Up @@ -94,7 +95,11 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
return;
}

setFragment(mFragment);
setContentView(R.layout.common_activity_content);
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.fragment_container, mFragment)
.commit();

if (savedInstanceState == null) {

Expand Down
262 changes: 0 additions & 262 deletions common/src/main/java/com/microsoft/identity/common/internal/ui/DualScreenActivity.java
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions common/src/main/res/layout/common_activity_content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
38 changes: 0 additions & 38 deletions common/src/main/res/layout/dual_screen_layout.xml
View file
Open in desktop

This file was deleted.

Loading