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

Fix java warnings for unchecked conversions in PlayStoreDynamicFeatureManager #22628

Merged
GaryQian merged 4 commits into from
Nov 20, 2020
Merged

Fix java warnings for unchecked conversions in PlayStoreDynamicFeatureManager #22628

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b36245a
Fix java warnings for unchecked conversions
GaryQian Nov 20, 2020
ea66cce
Use SparseArray
GaryQian Nov 20, 2020
c5163d7
Implement SparseArrays properly
GaryQian Nov 20, 2020
027e8af
Impl
GaryQian Nov 20, 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
31 changes: 16 additions & 15 deletions ...m/android/io/flutter/embedding/engine/dynamicfeatures/PlayStoreDynamicFeatureManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.AssetManager;
import android.os.Build;
import android.util.SparseArray;
import android.util.SparseIntArray;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.play.core.splitinstall.SplitInstallException;
Expand All @@ -22,10 +24,8 @@
import io.flutter.embedding.engine.FlutterJNI;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Queue;

/**
Expand All @@ -40,14 +40,14 @@ public class PlayStoreDynamicFeatureManager implements DynamicFeatureManager {
private @NonNull Context context;
// Each request to install a feature module gets a session ID. These maps associate
// the session ID with the loading unit and module name that was requested.
private @NonNull Map<Integer, String> sessionIdToName;
private @NonNull Map<Integer, Integer> sessionIdToLoadingUnitId;
private @NonNull SparseArray<String> sessionIdToName;
private @NonNull SparseIntArray sessionIdToLoadingUnitId;

private FeatureInstallStateUpdatedListener listener;

private class FeatureInstallStateUpdatedListener implements SplitInstallStateUpdatedListener {
public void onStateUpdate(SplitInstallSessionState state) {
if (sessionIdToName.containsKey(state.sessionId())) {
if (sessionIdToName.get(state.sessionId()) != null) {
// TODO(garyq): Add system channel for split aot messages.
switch (state.status()) {
case SplitInstallSessionStatus.FAILED:
Expand All @@ -63,8 +63,8 @@ public void onStateUpdate(SplitInstallSessionState state) {
sessionIdToLoadingUnitId.get(state.sessionId()),
"Module install failed with " + state.errorCode(),
true);
sessionIdToName.remove(state.sessionId());
sessionIdToLoadingUnitId.remove(state.sessionId());
sessionIdToName.delete(state.sessionId());
sessionIdToLoadingUnitId.delete(state.sessionId());
break;
}
case SplitInstallSessionStatus.INSTALLED:
Expand All @@ -83,8 +83,8 @@ public void onStateUpdate(SplitInstallSessionState state) {
loadDartLibrary(
sessionIdToLoadingUnitId.get(state.sessionId()),
sessionIdToName.get(state.sessionId()));
sessionIdToName.remove(state.sessionId());
sessionIdToLoadingUnitId.remove(state.sessionId());
sessionIdToName.delete(state.sessionId());
sessionIdToLoadingUnitId.delete(state.sessionId());
break;
}
case SplitInstallSessionStatus.CANCELED:
Expand All @@ -94,7 +94,8 @@ public void onStateUpdate(SplitInstallSessionState state) {
String.format(
"Module \"%s\" (sessionId %d) install canceled.",
sessionIdToName.get(state.sessionId()), state.sessionId()));
sessionIdToName.remove(state.sessionId());
sessionIdToName.delete(state.sessionId());
sessionIdToLoadingUnitId.delete(state.sessionId());
break;
}
case SplitInstallSessionStatus.CANCELING:
Expand Down Expand Up @@ -164,8 +165,8 @@ public PlayStoreDynamicFeatureManager(@NonNull Context context, @Nullable Flutte
splitInstallManager = SplitInstallManagerFactory.create(context);
listener = new FeatureInstallStateUpdatedListener();
splitInstallManager.registerListener(listener);
sessionIdToName = new HashMap();
sessionIdToLoadingUnitId = new HashMap();
sessionIdToName = new SparseArray<String>();
sessionIdToLoadingUnitId = new SparseIntArray();
}

public void setJNI(@NonNull FlutterJNI flutterJNI) {
Expand Down Expand Up @@ -293,10 +294,10 @@ public void loadDartLibrary(int loadingUnitId, String moduleName) {
// performant and robust.

// Search directly in APKs first
List<String> apkPaths = new ArrayList();
List<String> apkPaths = new ArrayList<String>();
Copy link
Member

@xster xster Nov 20, 2020

Choose a reason for hiding this comment

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

Android supports Java 7 now. You should be able to just do https://www.baeldung.com/java-diamond-operator

e.g. new ArrayList<>();

Copy link
Contributor Author

@GaryQian GaryQian Nov 20, 2020

Choose a reason for hiding this comment

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

Yep, though I'll clean this up later, let's get the roll through

// If not found in APKs, we check in extracted native libs for the lib directly.
List<String> soPaths = new ArrayList();
Queue<File> searchFiles = new LinkedList();
List<String> soPaths = new ArrayList<String>();
Queue<File> searchFiles = new LinkedList<File>();
searchFiles.add(context.getFilesDir());
while (!searchFiles.isEmpty()) {
File file = searchFiles.remove();
Expand Down