Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
66 changes: 66 additions & 0 deletions .github/workflows/build-apk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Build APK

on:
push:
branches:
- main
- PreBuild
- Pre-Release
- 'claude/**'
pull_request:
workflow_dispatch:

concurrency:
group: build-apk-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
name: Assemble debug and release APKs
runs-on: ubuntu-latest
timeout-minutes: 60

steps:
- name: Check out the repository
uses: actions/checkout@v4

- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '21'

- name: Set up the Android SDK
uses: android-actions/setup-android@v3

# The project builds native code through ndk-build (app/src/main/jni/Android.mk)
# and does not pin ndkVersion, so the NDK has to be present before AGP looks for it.
- name: Install the NDK
run: sdkmanager --install "ndk;27.2.12479018" "cmake;3.22.1"

- name: Set up Gradle
uses: gradle/actions/setup-gradle@v4

# gradlew is committed without the executable bit.
- name: Make gradlew executable
run: chmod +x ./gradlew

- name: Assemble debug APK
run: ./gradlew --no-daemon --stacktrace assembleDebug

- name: Assemble release APK (unsigned)
run: ./gradlew --no-daemon --stacktrace assembleRelease

- name: Upload debug APK
uses: actions/upload-artifact@v4
with:
name: abloq-debug-apk
path: app/build/outputs/apk/debug/*.apk
if-no-files-found: error

- name: Upload release APK
uses: actions/upload-artifact@v4
with:
name: abloq-release-apk-unsigned
path: app/build/outputs/apk/release/*.apk
if-no-files-found: error
28 changes: 28 additions & 0 deletions app/src/main/java/com/secureguard/mdm/SecureGuardApplication.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package com.secureguard.mdm

import android.content.ComponentName
import android.content.pm.PackageManager
import com.emanuelef.remote_capture.PCAPdroid
import com.secureguard.mdm.boot.BootCompletedReceiver
import com.secureguard.mdm.utils.AppLogger
import dagger.hilt.android.HiltAndroidApp
import java.security.SecureRandom
Expand All @@ -14,6 +17,31 @@ class SecureGuardApplication : PCAPdroid() {
AppLogger.init(this)
AppLogger.i("Application", "App started. Logger initialized.")
setupGlobalSslTrust()
ensureBootReceiverEnabled()
}

/**
* The receiver ships disabled in the manifest and is switched on when the password is
* first created. Installs that never went through that path (upgrades from an older
* build) had it left disabled, so no boot task ever ran and nothing was restored after
* a reboot. Re-asserting it on every start is idempotent and cheap.
*/
private fun ensureBootReceiverEnabled() {
try {
val receiver = ComponentName(this, BootCompletedReceiver::class.java)
if (packageManager.getComponentEnabledSetting(receiver) !=
PackageManager.COMPONENT_ENABLED_STATE_ENABLED
) {
packageManager.setComponentEnabledSetting(
receiver,
PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
PackageManager.DONT_KILL_APP
)
AppLogger.i("Application", "BootCompletedReceiver enabled.")
}
} catch (e: Exception) {
AppLogger.e("Application", "Failed to enable BootCompletedReceiver: ${e.message}")
}
}

private fun setupGlobalSslTrust() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ sealed class AppBlockerEvent {
data class OnFilterChanged(val newFilter: AppFilterType) : AppBlockerEvent()
data class OnAppSelectionChanged(val packageName: String, val isBlocked: Boolean) : AppBlockerEvent()
data class OnAppSuspensionChanged(val packageName: String, val isSuspended: Boolean) : AppBlockerEvent()
/** Clears both the block and the suspend flag for an app (unchecking its row). */
data class OnAppDeselected(val packageName: String) : AppBlockerEvent()
object OnSaveRequest : AppBlockerEvent() // יישמר מיידית
object OnDismissPasswordPrompt : AppBlockerEvent() // נשאר למקרה שימוש עתידי, לא מזיק
data class OnAddPackageManually(val packageName: String) : AppBlockerEvent()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ class AppBlockerViewModel @Inject constructor(
is AppBlockerEvent.OnFilterChanged -> onFilterChanged(event.newFilter)
is AppBlockerEvent.OnAppSelectionChanged -> onAppSelectionChanged(event.packageName, event.isBlocked)
is AppBlockerEvent.OnAppSuspensionChanged -> onAppSuspensionChanged(event.packageName, event.isSuspended)
is AppBlockerEvent.OnAppDeselected -> onAppDeselected(event.packageName)
is AppBlockerEvent.OnSaveRequest -> saveAndApplyChanges() // קריאה ישירה
is AppBlockerEvent.OnUnblockSelectedRequest -> unblockSelectedApps() // קריאה ישירה
is AppBlockerEvent.OnUnsuspendSelectedRequest -> unsuspendSelectedApps() // קריאה ישירה
Expand All @@ -83,8 +84,15 @@ class AppBlockerViewModel @Inject constructor(
}

fun loadAllData() {
// A refresh must not clear the search box or swap the list out for a spinner:
// both rebuild the LazyColumn from scratch and throw the user back to the top
// of a list that can be hundreds of apps long.
refreshData(showSpinner = _uiState.value.displayedAppsForSelection.isEmpty())
}

private fun refreshData(showSpinner: Boolean) {
viewModelScope.launch {
_uiState.update { it.copy(isLoading = true, searchQuery = "") }
if (showSpinner) _uiState.update { it.copy(isLoading = true) }
allAppsMasterList = getInstalledApps()
allBlockedAppsMasterList = getBlockedAppsFromCache()
allSuspendedAppsMasterList = getSuspendedAppsFromCache()
Expand Down Expand Up @@ -240,6 +248,13 @@ class AppBlockerViewModel @Inject constructor(
applyFilter()
}

private fun onAppDeselected(packageName: String) {
allAppsMasterList = allAppsMasterList.map {
if (it.packageName == packageName) it.copy(isBlocked = false, isSuspended = false) else it
}
applyFilter()
}

private fun onAppSuspensionChanged(packageName: String, isSuspended: Boolean) {
if (isSuspended && CRITICAL_SYSTEM_PACKAGES.contains(packageName)) {
val criticalAppInfos = allAppsMasterList.filter { it.packageName == packageName }
Expand All @@ -256,24 +271,31 @@ class AppBlockerViewModel @Inject constructor(
viewModelScope.launch(Dispatchers.IO) {
val oldBlockedSet = settingsRepository.getBlockedAppPackages()
val oldSuspendedSet = settingsRepository.getSuspendedAppPackages()
val newlySelectedApps = allAppsMasterList.filter { it.isBlocked }.map { it.packageName }.toSet()
val newlySuspendedApps = allAppsMasterList.filter { it.isSuspended }.map { it.packageName }.toSet()
val finalBlockedSet = oldBlockedSet + newlySelectedApps

val finalSuspendedSet = (oldSuspendedSet + newlySuspendedApps) - finalBlockedSet
// The master list is the source of truth for every package it covers, so
// clearing a checkbox actually removes the app. Packages the list does not
// cover (e.g. a blocked app that has since been uninstalled) are carried
// over untouched instead of being silently dropped.
val knownPackages = allAppsMasterList.map { it.packageName }.toSet()
val selectedBlocked = allAppsMasterList.filter { it.isBlocked }.map { it.packageName }.toSet()
val selectedSuspended = allAppsMasterList.filter { it.isSuspended }.map { it.packageName }.toSet()

val combinedSet = finalBlockedSet + finalSuspendedSet
if (combinedSet.contains(OWN_PACKAGE)) {
Log.w(TAG, "Skipping own package from block/suspend lists")
}
val finalBlockedSet = ((oldBlockedSet - knownPackages) + selectedBlocked) - OWN_PACKAGE
val finalSuspendedSet =
((((oldSuspendedSet - knownPackages) + selectedSuspended) - finalBlockedSet)) - OWN_PACKAGE

if (finalBlockedSet == oldBlockedSet && finalSuspendedSet == oldSuspendedSet) {
Log.d(TAG, "No changes to save.")
return@launch
}

val blockedToAdd = finalBlockedSet - oldBlockedSet
val blockedToRemove = oldBlockedSet - finalBlockedSet
val suspendedToAdd = finalSuspendedSet - oldSuspendedSet
val suspendedToRemove = oldSuspendedSet - finalSuspendedSet

// Check for critical system apps (block/suspend)
val criticalApps = (newlySelectedApps + newlySuspendedApps).filter { CRITICAL_SYSTEM_PACKAGES.contains(it) }
val criticalApps = (blockedToAdd + suspendedToAdd).filter { CRITICAL_SYSTEM_PACKAGES.contains(it) }
if (criticalApps.isNotEmpty()) {
val criticalAppInfos = allAppsMasterList.filter { criticalApps.contains(it.packageName) }
withContext(Dispatchers.Main) {
Expand All @@ -282,25 +304,33 @@ class AppBlockerViewModel @Inject constructor(
return@launch
}

settingsRepository.setBlockedAppPackages(finalBlockedSet - OWN_PACKAGE)
settingsRepository.setSuspendedAppPackages(finalSuspendedSet - OWN_PACKAGE)
settingsRepository.setBlockedAppPackages(finalBlockedSet)
settingsRepository.setSuspendedAppPackages(finalSuspendedSet)

val appsToCache = allAppsMasterList.filter {
combinedSet.contains(it.packageName) && !oldBlockedSet.contains(it.packageName) && !oldSuspendedSet.contains(it.packageName)
}
appsToCache.forEach { cacheAppInfo(it) }
// Only evict apps that are no longer protected at all — an app moving from
// suspended to blocked appears in both "removed" and "added" sets and must
// keep its cached name and icon.
val noLongerProtected =
(blockedToRemove + suspendedToRemove) - finalBlockedSet - finalSuspendedSet
removeAppsFromCache(noLongerProtected.toList())

val packagesToUnsuspend = oldSuspendedSet - finalSuspendedSet
packagesToUnsuspend.forEach { packageName ->
val newlyProtected = blockedToAdd + suspendedToAdd
allAppsMasterList.filter { newlyProtected.contains(it.packageName) }.forEach { cacheAppInfo(it) }

blockedToRemove.forEach { packageName ->
try {
dpm.setPackagesSuspended(adminComponentName, arrayOf(packageName), false)
Log.d(TAG, "Set suspended state for $packageName to false (auto)")
dpm.setApplicationHidden(adminComponentName, packageName, false)
Log.d(TAG, "Set hidden state for $packageName to false (deselected)")
} catch (e: Exception) {
Log.w(TAG, "Could not unsuspend $packageName", e)
Log.w(TAG, "Could not unhide $packageName", e)
}
}

newlySelectedApps.forEach { packageName ->
suspendedToRemove.forEach { packageName ->
setPackagesSuspendedSafely(packageName, false)
}

blockedToAdd.forEach { packageName ->
try {
dpm.setApplicationHidden(adminComponentName, packageName, true)
Log.d(TAG, "Set hidden state for $packageName to true")
Expand All @@ -309,16 +339,25 @@ class AppBlockerViewModel @Inject constructor(
}
}

newlySuspendedApps.forEach { packageName ->
try {
dpm.setPackagesSuspended(adminComponentName, arrayOf(packageName), true)
Log.d(TAG, "Set suspended state for $packageName to true")
} catch (e: Exception) {
Log.w(TAG, "Could not change suspended state for $packageName", e)
}
suspendedToAdd.forEach { packageName ->
setPackagesSuspendedSafely(packageName, true)
}

withContext(Dispatchers.Main) { loadAllData() }
withContext(Dispatchers.Main) { refreshData(showSpinner = false) }
}
}

/**
* setPackagesSuspended is API 24+; minSdk is 22, and a missing method raises
* NoSuchMethodError rather than an Exception, so the version has to be checked.
*/
private fun setPackagesSuspendedSafely(packageName: String, suspended: Boolean) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return
try {
dpm.setPackagesSuspended(adminComponentName, arrayOf(packageName), suspended)
Log.d(TAG, "Set suspended state for $packageName to $suspended")
} catch (e: Exception) {
Log.w(TAG, "Could not change suspended state for $packageName", e)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Add
Expand Down Expand Up @@ -41,6 +42,8 @@ fun AppSelectionScreen(
val snackbarHostState = remember { SnackbarHostState() }
var showAddPackageDialog by remember { mutableStateOf(false) }
var showActionChoiceDialog by remember { mutableStateOf<AppInfo?>(null) }
// Hoisted so the scroll position survives the list being rebuilt after a save.
val listState = rememberLazyListState()

LaunchedEffect(Unit) {
viewModel.loadAllData()
Expand Down Expand Up @@ -91,17 +94,18 @@ fun AppSelectionScreen(
CircularProgressIndicator()
}
} else {
LazyColumn(modifier = Modifier.fillMaxSize()) {
LazyColumn(modifier = Modifier.fillMaxSize(), state = listState) {
items(items = uiState.displayedAppsForSelection, key = { it.packageName }) { appInfo ->
AppSelectionRow(
appInfo = appInfo,
// Ticking a box only stages the change, so many apps can be
// marked in one pass and committed together with Save. Use the
// row itself when you want to suspend instead of block.
onCheckedChange = { isChecked ->
// Changes are applied only on save, not immediately
if (isChecked) {
showActionChoiceDialog = appInfo
viewModel.onEvent(AppBlockerEvent.OnAppSelectionChanged(appInfo.packageName, true))
} else {
// For unchecking, we don't immediately apply changes
// The user must save to apply the deselection
viewModel.onEvent(AppBlockerEvent.OnAppDeselected(appInfo.packageName))
}
},
onActionClick = { showActionChoiceDialog = appInfo }
Expand Down Expand Up @@ -144,15 +148,15 @@ fun AppSelectionScreen(
AppSelectionActionChoiceDialog(
appInfo = appInfo,
onDismiss = { showActionChoiceDialog = null },
// Staged only — saving here reloaded the whole list after every single app,
// which is what threw the user back to the top of the list each time.
onChooseBlock = {
showActionChoiceDialog = null
viewModel.onEvent(AppBlockerEvent.OnAppSelectionChanged(appInfo.packageName, true))
viewModel.onEvent(AppBlockerEvent.OnSaveRequest)
},
onChooseSuspend = {
showActionChoiceDialog = null
viewModel.onEvent(AppBlockerEvent.OnAppSuspensionChanged(appInfo.packageName, true))
viewModel.onEvent(AppBlockerEvent.OnSaveRequest)
}
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,12 @@ class AstoreDownloader @Inject constructor(
trySend(AstoreDownloadProgress.Error(lastException?.message ?: "Download failed after $maxRetries attempts"))
}

// The work is finished here. Without this close() the flow stayed open on
// awaitClose forever, so the collector never returned, the package was never
// released from activeInstalls, and every later attempt to update it was
// dropped by the in-flight guard — the update just appeared to hang.
close()

awaitClose { connections[urlString]?.disconnect() }
}.flowOn(Dispatchers.IO)

Expand Down Expand Up @@ -387,6 +393,11 @@ class AstoreDownloader @Inject constructor(
try {
val packageInstaller = context.packageManager.packageInstaller
val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL)
// Without this, Android 12+ answers the commit with STATUS_PENDING_USER_ACTION
// instead of installing, which is why single-APK updates never landed.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
params.setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED)
}
val sessionId = packageInstaller.createSession(params)
session = packageInstaller.openSession(sessionId)

Expand Down
Loading
Loading