diff --git a/Source/GUI/Android/app/src/main/AndroidManifest.xml b/Source/GUI/Android/app/src/main/AndroidManifest.xml index 1ee25d1cd..ee8de6b57 100644 --- a/Source/GUI/Android/app/src/main/AndroidManifest.xml +++ b/Source/GUI/Android/app/src/main/AndroidManifest.xml @@ -7,9 +7,11 @@ --> - - + + + + = 23) { + if (Build.VERSION.SDK_INT >= 33) { + if (checkSelfPermission(android.Manifest.permission.READ_MEDIA_IMAGES) != PackageManager.PERMISSION_GRANTED || + checkSelfPermission(android.Manifest.permission.READ_MEDIA_VIDEO) != PackageManager.PERMISSION_GRANTED || + checkSelfPermission(android.Manifest.permission.READ_MEDIA_AUDIO) != PackageManager.PERMISSION_GRANTED) { + pendingFileUris.add(uri) + ActivityCompat.requestPermissions(this@ReportListActivity, + arrayOf(android.Manifest.permission.READ_MEDIA_IMAGES, android.Manifest.permission.READ_MEDIA_VIDEO, android.Manifest.permission.READ_MEDIA_AUDIO), + READ_EXTERNAL_STORAGE_PERMISSION_REQUEST) + return + } + } else if (Build.VERSION.SDK_INT >= 23) { if (checkSelfPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { pendingFileUris.add(uri) ActivityCompat.requestPermissions(this@ReportListActivity, @@ -213,15 +223,15 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener { val uri: Uri? = intent.data if (uri != null) { handleUri(uri) + intent.putExtra(OPEN_INTENT_PROCESSED, true) } - intent.putExtra(OPEN_INTENT_PROCESSED, true) } Intent.ACTION_SEND -> { val uri = intent.getParcelableExtra(Intent.EXTRA_STREAM) if (uri != null) { handleUri(uri) + intent.putExtra(OPEN_INTENT_PROCESSED, true) } - intent.putExtra(OPEN_INTENT_PROCESSED, true) } Intent.ACTION_SEND_MULTIPLE -> { val uriList = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM) @@ -229,8 +239,8 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener { for (i in uriList) { handleUri(i) } + intent.putExtra(OPEN_INTENT_PROCESSED, true) } - intent.putExtra(OPEN_INTENT_PROCESSED, true) } } } diff --git a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/SubscribeActivity.kt b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/SubscribeActivity.kt index 8d8dc1694..b454c599a 100644 --- a/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/SubscribeActivity.kt +++ b/Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/SubscribeActivity.kt @@ -45,6 +45,11 @@ class SubscribeActivity : AppCompatActivity() { .replace("%PRICE%", subscriptionDetails.price) activitySubscribeBinding.subscriptionDetailText.visibility = View.VISIBLE activitySubscribeBinding.subscriptionDetailText.gravity = Gravity.CENTER_HORIZONTAL + + activitySubscribeBinding.subscriptionConditionText.text = activitySubscribeBinding.subscriptionConditionText.text.toString() + .replace("%PRICE%", subscriptionDetails.price) + activitySubscribeBinding.subscriptionConditionText.visibility = View.VISIBLE + activitySubscribeBinding.subscriptionConditionText.gravity = Gravity.CENTER_HORIZONTAL }) subscriptionManager.lifetimeDetails.observe (this, Observer { diff --git a/Source/GUI/Android/app/src/main/res/layout/activity_subscribe.xml b/Source/GUI/Android/app/src/main/res/layout/activity_subscribe.xml index ac56aea2c..a3570dc02 100644 --- a/Source/GUI/Android/app/src/main/res/layout/activity_subscribe.xml +++ b/Source/GUI/Android/app/src/main/res/layout/activity_subscribe.xml @@ -49,14 +49,15 @@ android:textColor="@android:color/white" android:background="@color/colorPrimary" android:layout_gravity="center_horizontal" /> + + + + diff --git a/Source/GUI/Android/app/src/main/res/values/strings.xml b/Source/GUI/Android/app/src/main/res/values/strings.xml index 596fb77a4..e57b18b4d 100644 --- a/Source/GUI/Android/app/src/main/res/values/strings.xml +++ b/Source/GUI/Android/app/src/main/res/values/strings.xml @@ -30,11 +30,21 @@ Exclusive features for premium subscribers Subscribe Subscribe - Subscribe for %PRICE% per year - Lifetime subscription for %PRICE% + Subscribe for %PRICE% per year + Lifetime subscription for %PRICE% Manage subscription Subscription detected. Thanks for your support! - Free 3 days trial period. + Free 3 days trial period. + + 3-Day Free Trial Subscription:\n\n + During this trial period, you\'ll have unlimited access to all the premium features.\n\n + Please remind that we currently don\'t provide many premium features, we provide a premium offer here for giving you an easy way to show your support to our open source project.\n\n + Subscription Terms:\n\n + Duration: Your 3-day trial subscription begins as soon as you sign up for the annual subscription for the first time.\n\n + Cost: The price for the subscription is %PRICE%. This amount will be charged to your Google Play account upon the end of the trial period annually unless canceled before the end of the trial period. + Conversion: At the end of the trial period, your subscription will automatically convert to a paid subscription unless canceled before the trial ends.\n\n + Cancellation: You can cancel your subscription at any time during the trial period to avoid being charged. To cancel, simply go to your Google Play Store account settings.\n\n + Support us. Get the dark theme and more features to come. Clear list Text