[docs] Merge pull request #58 from solrudev/develop

Fix Java sample
solrudev · Apr 25, 2024 · 254c543 · 254c543
2 parents dd6ebb1 + c1aa1c5
commit 254c543
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 31 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -14,7 +14,6 @@ Version 0.5.3 (2024-04-25)
 
 - Use `FileChannel` to read zipped APKs on Android Oreo+ if possible. This drastically improves performance when direct access through `java.io` APIs is not available and allows to process problematic ZIP files (such as XAPK files).
 - Don't crash if exception occurs while iterating APK sequence in sample apps, and display the exception message instead.
-- Share one thread pool across ViewModels in Java sample.
 
 Version 0.5.2 (2024-03-30)
 --------------------------

diff --git a/sample-java/src/main/java/ru/solrudev/ackpine/sample/ThreadPool.java b/sample-java/src/main/java/ru/solrudev/ackpine/sample/ThreadPool.java
diff --git a/sample-java/src/main/java/ru/solrudev/ackpine/sample/install/InstallViewModel.java b/sample-java/src/main/java/ru/solrudev/ackpine/sample/install/InstallViewModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import kotlin.sequences.Sequence;
 import ru.solrudev.ackpine.DisposableSubscriptionContainer;
@@ -51,7 +52,6 @@
 import ru.solrudev.ackpine.installer.PackageInstaller;
 import ru.solrudev.ackpine.installer.parameters.InstallParameters;
 import ru.solrudev.ackpine.sample.R;
-import ru.solrudev.ackpine.sample.ThreadPool;
 import ru.solrudev.ackpine.session.Failure;
 import ru.solrudev.ackpine.session.ProgressSession;
 import ru.solrudev.ackpine.session.Session;
@@ -225,7 +225,7 @@ public void onFailure(@NonNull UUID sessionId, @NonNull InstallFailure failure)
 				final var packageInstaller = PackageInstaller.getInstance(application);
 				final var savedStateHandle = createSavedStateHandle(creationExtras);
 				final var sessionsRepository = new SessionDataRepositoryImpl(savedStateHandle);
-				final var executor = ThreadPool.INSTANCE;
+				final var executor = Executors.newFixedThreadPool(8);
 				return new InstallViewModel(packageInstaller, sessionsRepository, executor);
 			}
 	);

diff --git a/sample-java/src/main/java/ru/solrudev/ackpine/sample/uninstall/UninstallViewModel.java b/sample-java/src/main/java/ru/solrudev/ackpine/sample/uninstall/UninstallViewModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,9 +39,9 @@
 import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import ru.solrudev.ackpine.DisposableSubscriptionContainer;
-import ru.solrudev.ackpine.sample.ThreadPool;
 import ru.solrudev.ackpine.session.Failure;
 import ru.solrudev.ackpine.session.Session;
 import ru.solrudev.ackpine.session.parameters.Confirmation;
@@ -186,7 +186,7 @@ public void onFailure(@NonNull UUID sessionId, @NonNull UninstallFailure failure
 				assert application != null;
 				final var packageUninstaller = PackageUninstaller.getInstance(application);
 				final var savedStateHandle = createSavedStateHandle(creationExtras);
-				final var executor = ThreadPool.INSTANCE;
+				final var executor = Executors.newFixedThreadPool(8);
 				return new UninstallViewModel(packageUninstaller, savedStateHandle, executor);
 			}
 	);