From 27e60edaf4b391cc2ae00a2ced436a14d495a6c5 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Thu, 24 Sep 2020 18:43:43 +0200 Subject: [PATCH] Fix check create button visibility --- .../activities/FileDatabaseSelectActivity.kt | 1 - .../keepass/utils/ExternalFileManager.kt | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt index a3e8d8e8e..36fa0f765 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt @@ -210,7 +210,6 @@ class FileDatabaseSelectActivity : SpecialModeActivity(), /** * Create a new file by calling the content provider */ - @SuppressLint("InlinedApi") private fun createNewFile() { createDocument(this, getString(R.string.database_file_name_default) + getString(R.string.database_file_extension_default), "application/x-keepass") diff --git a/app/src/main/java/com/kunzisoft/keepass/utils/ExternalFileManager.kt b/app/src/main/java/com/kunzisoft/keepass/utils/ExternalFileManager.kt index b0444dde5..c42d25127 100644 --- a/app/src/main/java/com/kunzisoft/keepass/utils/ExternalFileManager.kt +++ b/app/src/main/java/com/kunzisoft/keepass/utils/ExternalFileManager.kt @@ -19,6 +19,7 @@ */ package com.kunzisoft.keepass.utils +import android.annotation.SuppressLint import android.app.Activity import android.content.Intent import android.content.pm.PackageManager @@ -37,12 +38,18 @@ fun getUnusedCreateFileRequestCode(): Int { return newCreateFileRequestCode } +@SuppressLint("InlinedApi") fun allowCreateDocumentByStorageAccessFramework(packageManager: PackageManager): Boolean { - - return Intent(Intent.ACTION_CREATE_DOCUMENT).apply { - addCategory(Intent.CATEGORY_OPENABLE) - type = "application/x-keepass" - }.resolveActivity(packageManager) != null + return when { + // To check if a custom file manager can manage the ACTION_CREATE_DOCUMENT + Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT -> { + packageManager.queryIntentActivities(Intent(Intent.ACTION_CREATE_DOCUMENT).apply { + addCategory(Intent.CATEGORY_OPENABLE) + type = "application/x-keepass" + }, PackageManager.MATCH_DEFAULT_ONLY).isNotEmpty() + } + else -> true + } } fun createDocument(activity: FragmentActivity,