diff --git a/app/build.gradle b/app/build.gradle index 0b33d6d3..5a3516f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,14 +7,14 @@ apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.crashlytics' android { - compileSdkVersion 33 defaultConfig { applicationId "gr.thmmy.mthmmy" + compileSdk 33 minSdkVersion 23 targetSdkVersion 33 - versionCode 32 - versionName "2.2.0" + versionCode 33 + versionName "2.2.1" archivesBaseName = "mTHMMY-v$versionName" buildConfigField "String", "CURRENT_BRANCH", "\"" + getCurrentBranch() + "\"" buildConfigField "String", "COMMIT_HASH", "\"" + getCommitHash() + "\"" diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java index 9a8f45d4..2b2d2b4e 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java +++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java @@ -18,7 +18,9 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; +import android.text.Html; import android.view.MenuItem; import android.view.View; import android.widget.Button; @@ -695,12 +697,15 @@ public abstract class BaseActivity extends AppCompatActivity { //True if permissions are OK protected boolean checkPerms() { Timber.i("Checking storage permissions."); - String[] PERMISSIONS_STORAGE = { - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE}; + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU){ + String[] PERMISSIONS_STORAGE = { + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE}; - return !(checkSelfPermission(PERMISSIONS_STORAGE[0]) == PackageManager.PERMISSION_DENIED || - checkSelfPermission(PERMISSIONS_STORAGE[1]) == PackageManager.PERMISSION_DENIED); + return !(checkSelfPermission(PERMISSIONS_STORAGE[0]) == PackageManager.PERMISSION_DENIED || + checkSelfPermission(PERMISSIONS_STORAGE[1]) == PackageManager.PERMISSION_DENIED); + } + return true; } //Display popup for user to grant permission @@ -735,7 +740,8 @@ public abstract class BaseActivity extends AppCompatActivity { prepareDownload(thmmyFile); else { tempThmmyFile = thmmyFile; - requestPerms(DOWNLOAD_REQUEST_CODE); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) + requestPerms(DOWNLOAD_REQUEST_CODE); } }