Move resolveInfosById instantiations to cacheResolveInfos

bleroux · bleroux · commit 554c18f0f2f3 · 2023-10-11T08:53:46.000+02:00
diff --git a/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java b/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java
@@ -49,7 +49,6 @@ public ProcessTextPlugin(@NonNull ProcessTextChannel processTextChannel) {
   @Override
   public Map<String, String> queryTextActions() {
     if (resolveInfosById == null) {
-      resolveInfosById = new HashMap<String, ResolveInfo>();
       cacheResolveInfos();
     }
     Map<String, String> result = new HashMap<String, String>();
@@ -104,6 +103,8 @@ public void processTextAction(
   }
 
   private void cacheResolveInfos() {
+    resolveInfosById = new HashMap<String, ResolveInfo>();
+
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
       return;
     }
@@ -117,7 +118,6 @@ private void cacheResolveInfos() {
       infos = packageManager.queryIntentActivities(intent, 0);
     }
 
-    resolveInfosById.clear();
     for (ResolveInfo info : infos) {
       final String id = info.activityInfo.name;
       final String label = info.loadLabel(packageManager).toString();

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ public ProcessTextPlugin(@NonNull ProcessTextChannel processTextChannel) {`
`49`	`49`	`@Override`
`50`	`50`	`public Map<String, String> queryTextActions() {`
`51`	`51`	`if (resolveInfosById == null) {`
`52`		`- resolveInfosById = new HashMap<String, ResolveInfo>();`
`53`	`52`	`cacheResolveInfos();`
`54`	`53`	`}`
`55`	`54`	`Map<String, String> result = new HashMap<String, String>();`
`@@ -104,6 +103,8 @@ public void processTextAction(`
`104`	`103`	`}`
`105`	`104`
`106`	`105`	`private void cacheResolveInfos() {`
	`106`	`+ resolveInfosById = new HashMap<String, ResolveInfo>();`
	`107`	`+`
`107`	`108`	`if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {`
`108`	`109`	`return;`
`109`	`110`	`}`
`@@ -117,7 +118,6 @@ private void cacheResolveInfos() {`
`117`	`118`	`infos = packageManager.queryIntentActivities(intent, 0);`
`118`	`119`	`}`
`119`	`120`
`120`		`- resolveInfosById.clear();`
`121`	`121`	`for (ResolveInfo info : infos) {`
`122`	`122`	`final String id = info.activityInfo.name;`
`123`	`123`	`final String label = info.loadLabel(packageManager).toString();`