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

[Espresso] Android Code Inspection and Clean up #3111

Merged
hamdikahloun merged 11 commits into from
Dec 4, 2020
Merged

[Espresso] Android Code Inspection and Clean up #3111

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
607d56a
Remove unchecked && deprecated Warnings
hamdikahloun Oct 4, 2020
13846a8
Remove settings_aar.gradle
hamdikahloun Oct 4, 2020
124fa7e
Update CHANGELOG.md
hamdikahloun Oct 4, 2020
97b6e81
Fix Format
hamdikahloun Oct 4, 2020
8ce4f59
Fix Format
hamdikahloun Oct 4, 2020
227d616
Merge remote-tracking branch 'upstream/master' into espresso
hamdikahloun Oct 12, 2020
842eac5
espresso
hamdikahloun Oct 12, 2020
c978c31
noinspection deprecation
hamdikahloun Dec 2, 2020
d0dc85a
Format
hamdikahloun Dec 2, 2020
68ca9c3
SuppressWarnings
hamdikahloun Dec 3, 2020
4982f04
Merge remote-tracking branch 'upstream/master' into espresso
hamdikahloun Dec 4, 2020
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
Prev Previous commit
Next Next commit
SuppressWarnings
  • Loading branch information
@hamdikahloun
hamdikahloun committed Dec 3, 2020
commit 68ca9c3a60d4f8c60c68946056c65261248953e3
5 changes: 2 additions & 3 deletions ...presso/android/src/main/java/androidx/test/espresso/flutter/action/FlutterViewAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,14 +199,13 @@ public String getName() {
return FlutterViewRenderedIdlingResource.class.getSimpleName();
}

@SuppressWarnings("deprecation")
Copy link
Member

@xster xster Dec 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

put the lint on the specific lines that accesses io.flutter.view.FlutterView

@Override
public boolean isIdleNow() {
boolean isIdle = false;
if (flutterView instanceof FlutterView) {
isIdle = ((FlutterView) flutterView).hasRenderedFirstFrame();
} else //noinspection deprecation
if (flutterView instanceof io.flutter.view.FlutterView) {
//noinspection deprecation
} else if (flutterView instanceof io.flutter.view.FlutterView) {
isIdle = ((io.flutter.view.FlutterView) flutterView).hasRenderedFirstFrame();
} else {
throw new FlutterProtocolException(
Expand Down
3 changes: 1 addition & 2 deletions ...rc/main/java/androidx/test/espresso/flutter/internal/protocol/impl/DartVmServiceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,12 @@ public static String getDartIsolateId(View flutterView) {
}

/** Gets the Dart executor for the given {@code flutterView}. */
@SuppressWarnings("deprecation")
Copy link
Member

@xster xster Dec 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto here

Copy link
Member Author

@hamdikahloun hamdikahloun Dec 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR Updated with requested changes . Thank you

public static DartExecutor getDartExecutor(View flutterView) {
checkNotNull(flutterView, "The Flutter View instance cannot be null.");
// Flutter's embedding is in the phase of rewriting/refactoring. Let's be compatible with both
// the old and the new FlutterView classes.
//noinspection deprecation
if (flutterView instanceof io.flutter.view.FlutterView) {
//noinspection deprecation
return ((io.flutter.view.FlutterView) flutterView).getDartExecutor();
} else if (flutterView instanceof io.flutter.embedding.android.FlutterView) {
FlutterEngine flutterEngine =
Expand Down