Update requests folder

jahirfiquitiva · Sep 12, 2019 · 5ba1eb7 · 5ba1eb7
1 parent f8cafc4
commit 5ba1eb7
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,8 +15,8 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  package="jahirfiquitiva.apps.blueprint.demo">
+ xmlns:tools="http://schemas.android.com/tools"
+ package="jahirfiquitiva.apps.blueprint.demo">
 
  <!-- Permission required for donations -->
  <uses-permission android:name="com.android.vending.BILLING" />
@@ -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">
 
  <!-- TODO: Remove comment marks to enable Zooper
@@ -280,10 +281,10 @@
  <provider
  android:name=".MuzeiService"
  android:authorities="${applicationId}.muzei"
- android:label="@string/app_name"
  android:description="@string/app_description"
- android:icon="@drawable/ic_muzei_icon"
  android:exported="true"
+ android:icon="@drawable/ic_muzei_icon"
+ android:label="@string/app_name"
  android:permission="com.google.android.apps.muzei.api.ACCESS_PROVIDER"
  tools:ignore="ExportedService">
  <intent-filter>

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -26,7 +26,7 @@ ext.versions = [
  kotlin : '1.3.50',
  libs : '2.1',
  // Dependencies
- kuper : '1.7.0',
+ kuper : '1.7.1',
  counterFab : '1.2.1',
  fuel : '1.16.0',
  oneSignal : '3.11.3'

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <!--suppress AndroidDomInspection -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  package="jahirfiquitiva.libs.blueprint">
+ xmlns:tools="http://schemas.android.com/tools"
+ package="jahirfiquitiva.libs.blueprint">
 
  <uses-permission android:name="com.android.vending.CHECK_LICENSE" />
  <uses-permission
@@ -44,6 +44,7 @@
 
  <application
  android:allowBackup="true"
+ android:requestLegacyExternalStorage="true"
  android:supportsRtl="true"
  tools:ignore="AllowBackup,UnusedAttribute">
 
@@ -78,16 +79,16 @@
  <!-- Icons -->
  <activity
  android:name=".ui.activities.BaseBlueprintActivity"
- android:windowSoftInputMode="stateHidden|adjustResize|adjustPan"
- android:exported="false" />
+ android:exported="false"
+ android:windowSoftInputMode="stateHidden|adjustResize|adjustPan" />
 
  <activity
  android:name=".ui.activities.BlueprintKuperActivity"
  android:exported="false" />
  <activity
  android:name=".ui.activities.HelpActivity"
- android:windowSoftInputMode="stateHidden|adjustResize|adjustPan"
- android:exported="false" />
+ android:exported="false"
+ android:windowSoftInputMode="stateHidden|adjustResize|adjustPan" />
  <activity
  android:name=".ui.activities.CreditsActivity"
  android:exported="false" />

diff --git a/...y/src/main/kotlin/jahirfiquitiva/libs/blueprint/providers/viewmodels/RequestsViewModel.kt b/...y/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)