Skip to content

Commit 6f2b68e

Browse files
authored
fix: change ArrayList to HashSet in android module (#95)
* fix: change ArrayList to HashSet in android module * fix: Move removing the activeComponent logic to the completion. * fix: change removeIf to remove
1 parent d3a9451 commit 6f2b68e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

android/src/main/java/com/reactnativechangeicon/ChangeIconModule.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
import com.facebook.react.bridge.ReactMethod;
1515
import com.facebook.react.module.annotations.ReactModule;
1616

17-
import java.util.ArrayList;
18-
import java.util.List;
17+
import java.util.HashSet;
18+
import java.util.Set;
1919

2020
@ReactModule(name = "ChangeIcon")
2121
public class ChangeIconModule extends ReactContextBaseJavaModule implements Application.ActivityLifecycleCallbacks {
2222
public static final String NAME = "ChangeIcon";
2323
private final String packageName;
24-
private final List<String> classesToKill = new ArrayList<>();
24+
private final Set<String> classesToKill = new HashSet<>();
2525
private Boolean iconChanged = false;
2626
private String componentClass = "";
2727

@@ -91,7 +91,6 @@ public void changeIcon(String iconName, Promise promise) {
9191
this.componentClass = activeClass;
9292
activity.getApplication().registerActivityLifecycleCallbacks(this);
9393
iconChanged = true;
94-
activity.finish();
9594
}
9695

9796
private void completeIconChange() {
@@ -100,6 +99,8 @@ private void completeIconChange() {
10099
final Activity activity = getCurrentActivity();
101100
if (activity == null)
102101
return;
102+
103+
classesToKill.remove(componentClass);
103104
classesToKill.forEach((cls) -> activity.getPackageManager().setComponentEnabledSetting(
104105
new ComponentName(this.packageName, cls),
105106
PackageManager.COMPONENT_ENABLED_STATE_DISABLED,

0 commit comments

Comments
 (0)