Merge pull request #359 from OpenHub-Store/shizuku-release-fix

Author: rainxchzed

composeApp/proguard-rules.pro

@@ -167,6 +167,20 @@
 -keep class com.google.firebase.** { *; }
 -dontwarn com.google.firebase.**
 
+# ── Shizuku (Silent Install) ─────────────────────────────────────────────
+# The UserService class name is passed to Shizuku via ComponentName — R8 must
+# not rename or remove it, otherwise bindUserService() silently fails.
+-keep class zed.rainxch.core.data.services.shizuku.ShizukuInstallerServiceImpl { *; }
+
+# AIDL-generated Stub/Proxy classes for IPC between app and privileged process
+-keep class zed.rainxch.core.data.services.shizuku.IShizukuInstallerService { *; }
+-keep class zed.rainxch.core.data.services.shizuku.IShizukuInstallerService$Stub { *; }
+-keep class zed.rainxch.core.data.services.shizuku.IShizukuInstallerService$Stub$Proxy { *; }
+
+# Shizuku library internals (binder listeners, service args, provider)
+-keep class rikka.shizuku.** { *; }
+-dontwarn rikka.shizuku.**
+
 # ── Enum safety ────────────────────────────────────────────────────────────
 # Keep all enum values and valueOf methods (used by serialization/Room)
 -keepclassmembers enum * {

composeApp/src/androidMain/res/xml/filepaths.xml

@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <external-files-path
+    <!-- Public Downloads/GitHub Store folder (visible in file managers) -->
+    <external-path
         name="ghs_downloads"
+        path="Download/GitHub Store/" />
+
+    <!-- Legacy app-private downloads (for migration) -->
+    <external-files-path
+        name="ghs_legacy_downloads"
         path="/" />
 
     <cache-path

core/data/src/androidMain/kotlin/zed/rainxch/core/data/services/AndroidFileLocationsProvider.kt

@@ -1,20 +1,21 @@
 package zed.rainxch.core.data.services
 
 import android.content.Context
+import android.os.Environment
 import java.io.File
 
 class AndroidFileLocationsProvider(
     private val context: Context,
 ) : zed.rainxch.core.data.services.FileLocationsProvider {
     override fun appDownloadsDir(): String {
-        val externalFilesRoot = context.getExternalFilesDir(null)
-        val dir = File(externalFilesRoot, "ghs_downloads")
+        val publicDownloads = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+        val dir = File(publicDownloads, "GitHub Store")
         if (!dir.exists()) dir.mkdirs()
         return dir.absolutePath
     }
 
     override fun userDownloadsDir(): String {
-        return "" // No-op
+        return appDownloadsDir()
     }
 
     override fun setExecutableIfNeeded(path: String) {

feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileAction.kt

@@ -34,6 +34,8 @@ sealed interface ProfileAction {
 
     data object OnLoginClick : ProfileAction
 
+    data object OnRefreshCacheSize : ProfileAction
+
     data object OnClearCacheClick : ProfileAction
 
     data object OnClearDownloadsConfirm : ProfileAction

feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileRoot.kt

@@ -14,13 +14,15 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import io.github.fletchmckee.liquid.liquefiable
 import kotlinx.coroutines.launch
@@ -54,6 +56,20 @@ fun ProfileRoot(
     val snackbarState = remember { SnackbarHostState() }
     val coroutineScope = rememberCoroutineScope()
 
+    val lifecycleOwner = LocalLifecycleOwner.current
+    DisposableEffect(lifecycleOwner) {
+        val observer =
+            androidx.lifecycle.LifecycleEventObserver { _, event ->
+                if (event == androidx.lifecycle.Lifecycle.Event.ON_RESUME) {
+                    viewModel.onAction(ProfileAction.OnRefreshCacheSize)
+                }
+            }
+        lifecycleOwner.lifecycle.addObserver(observer)
+        onDispose {
+            lifecycleOwner.lifecycle.removeObserver(observer)
+        }
+    }
+
     ObserveAsEvents(viewModel.events) { event ->
         when (event) {
             ProfileEvent.OnLogoutSuccessful -> {

feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileViewModel.kt

@@ -57,12 +57,11 @@ class ProfileViewModel(
                     loadScrollbarEnabled()
 
                     observeLoggedInStatus()
-
-                    observeCacheSize()
                     observeShizukuStatus()
 
                     hasLoadedInitialData = true
                 }
+                refreshCacheSize()
             }.stateIn(
                 scope = viewModelScope,
                 started = SharingStarted.WhileSubscribed(5_000L),
@@ -72,7 +71,7 @@ class ProfileViewModel(
     private val _events = Channel<ProfileEvent>()
     val events = _events.receiveAsFlow()
 
-    private fun observeCacheSize() {
+    private fun refreshCacheSize() {
         viewModelScope.launch {
             profileRepository.observeCacheSize().collect { sizeBytes ->
                 _state.update {
@@ -299,6 +298,10 @@ class ProfileViewModel(
                 )
             }
 
+            ProfileAction.OnRefreshCacheSize -> {
+                refreshCacheSize()
+            }
+
             ProfileAction.OnClearCacheClick -> {
                 _state.update { it.copy(isClearDownloadsDialogVisible = true) }
             }
@@ -309,7 +312,7 @@ class ProfileViewModel(
                     runCatching {
                         profileRepository.clearCache()
                     }.onSuccess {
-                        observeCacheSize()
+                        refreshCacheSize()
                         _events.send(ProfileEvent.OnCacheCleared)
                     }.onFailure { error ->
                         _events.send(