Skip to content

Update AppCloseAndroidService to clear SecretCache #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zHd4 merged 2 commits into from
Jul 17, 2026
Merged

Update AppCloseAndroidService to clear SecretCache #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c6be80
Clear secret cache on task removal to enhance security in AppCloseAnd…
zHd4 Jul 17, 2026
2168b6f
Update AppCloseAndroidServiceTest to verify secret cache clearance on…
zHd4 Jul 17, 2026
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
7 changes: 6 additions & 1 deletion service/src/main/java/app/notesr/service/lifecycle/AppCloseAndroidService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat;

import app.notesr.core.security.crypto.CryptoManager;
import app.notesr.core.security.SecretCache;
import app.notesr.core.security.crypto.CryptoManagerProvider;
import app.notesr.data.DatabaseProvider;
import app.notesr.service.AndroidService;
Expand Down Expand Up @@ -81,6 +81,7 @@ protected AndroidServiceEntry getEntry(String payload, String state) {
@Override
public void onTaskRemoved(Intent rootIntent) {
if (getOtherRunningServicesCount() == 0) {
clearSecretCache();
closeDatabase();
destroySecrets();

Expand Down Expand Up @@ -116,6 +117,10 @@ long getOtherRunningServicesCount() {
.count();
}

void clearSecretCache() {
SecretCache.clear();
}

void closeDatabase() {
DatabaseProvider.close();
}
Expand Down
7 changes: 7 additions & 0 deletions service/src/test/java/app/notesr/service/lifecycle/AppCloseAndroidServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ void setUp() {
@Test
void testOnTaskRemovedWhenNoOtherServicesRunningClosesEverythingAndExits() {
doReturn(0L).when(service).getOtherRunningServicesCount();
doNothing().when(service).clearSecretCache();
doNothing().when(service).closeDatabase();
doNothing().when(service).destroySecrets();
doNothing().when(service).stopForegroundService();
Expand All @@ -44,6 +45,9 @@ void testOnTaskRemovedWhenNoOtherServicesRunningClosesEverythingAndExits() {

service.onTaskRemoved(intent);

verify(service, description("Secret cache should be cleared" +
" when no other services are running"))
.clearSecretCache();
verify(service, description("Database should be closed" +
" when no other services are running"))
.closeDatabase();
Expand Down Expand Up @@ -74,6 +78,9 @@ void testOnTaskRemovedWhenOtherServicesRunningOnlyStopsSelf() {

service.onTaskRemoved(intent);

verify(service, never().description("Secret cache should NOT be cleared" +
" when other services are running"))
.clearSecretCache();
verify(service, never().description("Database should NOT be closed" +
" when other services are running"))
.closeDatabase();
Expand Down
Loading