diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c6d101508..b2fcd3b0b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -15,8 +15,8 @@ --> + xmlns:tools="http://schemas.android.com/tools" + package="jahirfiquitiva.apps.blueprint.demo"> @@ -27,11 +27,12 @@ android:fullBackupContent="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:manageSpaceActivity="jahirfiquitiva.libs.blueprint.ui.activities.SettingsActivity" + android:networkSecurityConfig="@xml/network_security_config" + android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/MySplashScreen" - android:manageSpaceActivity="jahirfiquitiva.libs.blueprint.ui.activities.SettingsActivity" - android:networkSecurityConfig="@xml/network_security_config" tools:ignore="UnusedAttribute"> + xmlns:tools="http://schemas.android.com/tools" + package="jahirfiquitiva.libs.blueprint"> @@ -78,16 +79,16 @@ + android:exported="false" + android:windowSoftInputMode="stateHidden|adjustResize|adjustPan" /> + android:exported="false" + android:windowSoftInputMode="stateHidden|adjustResize|adjustPan" /> diff --git a/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/providers/viewmodels/RequestsViewModel.kt b/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/providers/viewmodels/RequestsViewModel.kt index 7e241a447..0df943ab2 100644 --- a/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/providers/viewmodels/RequestsViewModel.kt +++ b/library/src/main/kotlin/jahirfiquitiva/libs/blueprint/providers/viewmodels/RequestsViewModel.kt @@ -24,6 +24,7 @@ import androidx.lifecycle.Observer import androidx.lifecycle.ViewModel import jahirfiquitiva.libs.archhelpers.tasks.QAsync import jahirfiquitiva.libs.blueprint.R +import jahirfiquitiva.libs.blueprint.helpers.utils.BL import jahirfiquitiva.libs.blueprint.helpers.utils.BPKonfigs import jahirfiquitiva.libs.blueprint.quest.App import jahirfiquitiva.libs.blueprint.quest.IconRequest @@ -114,14 +115,21 @@ class RequestsViewModel : ViewModel() { forceLoad: Boolean = false ) { - val externalFolder = try { + val externalStorage = try { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { + @Suppress("DEPRECATION") Environment.getExternalStorageDirectory() + } else { + @Suppress("DEPRECATION") + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) } - context.getExternalFilesDir(null) ?: Environment.getExternalStorageDirectory() } catch (e: Exception) { - Environment.getExternalStorageDirectory() + null } + val appStorage = context.getExternalFilesDir(null) + val defFolder = + if (appStorage?.absolutePath?.contains(context.packageName) == true) externalStorage + else appStorage val list = IconRequest.get()?.apps.orEmpty() if (list.isEmpty() || forceLoad) { @@ -132,7 +140,7 @@ class RequestsViewModel : ViewModel() { .toEmail(context.getString(R.string.email)) .withAPIHost(host.orEmpty()) .withAPIKey(apiKey) - .saveDir(File(context.getString(R.string.request_save_location, externalFolder))) + .saveDir(File(context.getString(R.string.request_save_location, defFolder))) .filterXml(R.xml.appfilter) .withTimeLimit( context.int(R.integer.time_limit_in_minutes), BPKonfigs(context).prefs)