Drop legacy and unsupported Android 9, small reformating

PatrykMis · PatrykMis · commit f8f3abe0cfc2 · 2022-11-21T02:41:41.000+01:00
diff --git a/README.md b/README.md
@@ -11,10 +11,10 @@ BCR is a simple Android call recording app for rooted devices or devices running
 
 ### Features
 
-* Supports Android 9 through 13
+* Supports Android 10 through 13
 * Supports output in various formats:
-  * OGG/Opus - Lossy, smallest files, default on Android 10+
-  * M4A/AAC - Lossy, smaller files, default on Android 9
+  * OGG/Opus - Lossy, smallest files, default
+  * M4A/AAC - Lossy, smaller files
   * FLAC - Lossless, larger files
   * WAV/PCM - Lossless, largest files, least CPU usage
 * Supports Android's Storage Access Framework (can record to SD cards, USB devices, etc.)
diff --git a/app/.gitignore b/app/.gitignore
@@ -1 +1 @@
-/build
+/build
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -101,7 +101,7 @@ android {
 
     defaultConfig {
         applicationId = "com.chiller3.bcr"
-        minSdk = 28
+        minSdk = 29
         targetSdk = 33
         versionCode = gitVersionCode
         versionName = gitVersionName
@@ -311,4 +311,4 @@ android.applicationVariants.all {
             }
         }
     }
-}
+}
diff --git a/app/magisk/updates/release/info.json b/app/magisk/updates/release/info.json
@@ -3,4 +3,4 @@
     "changelog": "https://github.com/chenxiaolong/BCR/raw/master/app/magisk/updates/release/changelog.txt",
     "version": "1.23",
     "versionCode": 71424
-}
+}
diff --git a/app/src/androidTest/java/com/chiller3/bcr/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/chiller3/bcr/ExampleInstrumentedTest.kt
@@ -21,4 +21,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.chiller3.bcr", appContext.packageName)
     }
-}
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -63,4 +63,4 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
+</manifest>
diff --git a/app/src/main/java/com/chiller3/bcr/AudioFormatExtension.kt b/app/src/main/java/com/chiller3/bcr/AudioFormatExtension.kt
@@ -1,13 +1,6 @@
 package com.chiller3.bcr
 
 import android.media.AudioFormat
-import android.os.Build
 
 val AudioFormat.frameSizeInBytesCompat: Int
-    get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        frameSizeInBytes
-    } else{
-        // Hardcoded for Android 9 compatibility only
-        assert(encoding == AudioFormat.ENCODING_PCM_16BIT)
-        2 * channelCount
-    }
+    get() = frameSizeInBytes
diff --git a/app/src/main/java/com/chiller3/bcr/ChipGroupCentered.kt b/app/src/main/java/com/chiller3/bcr/ChipGroupCentered.kt
@@ -137,4 +137,4 @@ class ChipGroupCentered(context: Context, attrs: AttributeSet?, defStyleAttr: In
             }
         }
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/LongClickablePreference.kt b/app/src/main/java/com/chiller3/bcr/LongClickablePreference.kt
@@ -22,4 +22,4 @@ class LongClickablePreference(context: Context, attrs: AttributeSet?) : Preferen
     interface OnPreferenceLongClickListener {
         fun onPreferenceLongClick(preference: Preference): Boolean
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/OpenPersistentDocumentTree.kt b/app/src/main/java/com/chiller3/bcr/OpenPersistentDocumentTree.kt
@@ -21,4 +21,4 @@ class OpenPersistentDocumentTree : ActivityResultContracts.OpenDocumentTree() {
 
         return intent
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/OutputDirectoryBottomSheetFragment.kt b/app/src/main/java/com/chiller3/bcr/OutputDirectoryBottomSheetFragment.kt
@@ -78,4 +78,4 @@ class OutputDirectoryBottomSheetFragment : BottomSheetDialogFragment(), Slider.O
     companion object {
         val TAG: String = OutputDirectoryBottomSheetFragment::class.java.simpleName
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/OutputFormatBottomSheetFragment.kt b/app/src/main/java/com/chiller3/bcr/OutputFormatBottomSheetFragment.kt
@@ -181,4 +181,4 @@ class OutputFormatBottomSheetFragment : BottomSheetDialogFragment(),
     companion object {
         val TAG: String = OutputFormatBottomSheetFragment::class.java.simpleName
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/Permissions.kt b/app/src/main/java/com/chiller3/bcr/Permissions.kt
@@ -57,4 +57,4 @@ object Permissions {
         intent.data = Uri.fromParts("package", context.packageName, null)
         return intent
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/Preferences.kt b/app/src/main/java/com/chiller3/bcr/Preferences.kt
@@ -192,4 +192,4 @@ class Preferences(private val context: Context) {
     var sampleRate: SampleRate?
         get() = getOptionalUint(PREF_SAMPLE_RATE)?.let { SampleRate(it) }
         set(sampleRate) = setOptionalUint(PREF_SAMPLE_RATE, sampleRate?.value)
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/RecorderApplication.kt b/app/src/main/java/com/chiller3/bcr/RecorderApplication.kt
@@ -48,4 +48,4 @@ class RecorderApplication : Application() {
         val notificationManager = getSystemService(NotificationManager::class.java)
         notificationManager.createNotificationChannel(channel)
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/RecorderInCallService.kt b/app/src/main/java/com/chiller3/bcr/RecorderInCallService.kt
@@ -283,4 +283,4 @@ class RecorderInCallService : InCallService(), RecorderThread.OnRecordingComplet
             notifyError(errorMsg, uri)
         }
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/RecorderThread.kt b/app/src/main/java/com/chiller3/bcr/RecorderThread.kt
@@ -113,13 +113,12 @@ class RecorderThread(
                 callTimestamp = ZonedDateTime.ofInstant(instant, ZoneId.systemDefault())
                 append(FORMATTER.format(callTimestamp))
 
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    when (details.callDirection) {
-                        Call.Details.DIRECTION_INCOMING -> append("_in")
-                        Call.Details.DIRECTION_OUTGOING -> append("_out")
-                        Call.Details.DIRECTION_UNKNOWN -> {}
-                    }
+                when (details.callDirection) {
+                    Call.Details.DIRECTION_INCOMING -> append("_in")
+                    Call.Details.DIRECTION_OUTGOING -> append("_out")
+                    Call.Details.DIRECTION_UNKNOWN -> {}
                 }
+            }
 
                 if (details.handle?.scheme == PhoneAccount.SCHEME_TEL) {
                     append('_')
@@ -624,4 +623,4 @@ class RecorderThread(
          */
         fun onRecordingFailed(thread: RecorderThread, errorMsg: String?, uri: Uri?)
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/RecorderTileService.kt b/app/src/main/java/com/chiller3/bcr/RecorderTileService.kt
@@ -61,4 +61,4 @@ class RecorderTileService : TileService(), SharedPreferences.OnSharedPreferenceC
 
         tile.updateTile()
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/SettingsActivity.kt b/app/src/main/java/com/chiller3/bcr/SettingsActivity.kt
@@ -218,4 +218,4 @@ class SettingsActivity : AppCompatActivity() {
             }
         }
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/UriExtensions.kt b/app/src/main/java/com/chiller3/bcr/UriExtensions.kt
@@ -22,4 +22,4 @@ val Uri.formattedString: String
             }
         }
         else -> toString()
-    }
+    }
diff --git a/app/src/main/java/com/chiller3/bcr/format/AacFormat.kt b/app/src/main/java/com/chiller3/bcr/format/AacFormat.kt
@@ -39,4 +39,4 @@ object AacFormat : Format() {
 
     override fun getContainer(fd: FileDescriptor): Container =
         MediaMuxerContainer(fd, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4)
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/format/Encoder.kt b/app/src/main/java/com/chiller3/bcr/format/Encoder.kt
@@ -45,4 +45,4 @@ abstract class Encoder(
      * @param isEof No more data can be submitted after this method is called once with EOF == true.
      */
     abstract fun encode(buffer: ByteBuffer, isEof: Boolean)
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/format/FlacContainer.kt b/app/src/main/java/com/chiller3/bcr/format/FlacContainer.kt
@@ -150,4 +150,4 @@ class FlacContainer(private val fd: FileDescriptor) : Container {
         private val TAG = FlacContainer::class.java.simpleName
         private val FLAC_MAGIC = ubyteArrayOf(0x66u, 0x4cu, 0x61u, 0x43u) // fLaC
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/format/FlacFormat.kt b/app/src/main/java/com/chiller3/bcr/format/FlacFormat.kt
@@ -27,4 +27,4 @@ object FlacFormat : Format() {
 
     override fun getContainer(fd: FileDescriptor): Container =
         FlacContainer(fd)
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/format/Format.kt b/app/src/main/java/com/chiller3/bcr/format/Format.kt
@@ -116,4 +116,4 @@ sealed class Format {
             return Pair(format, param)
         }
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/format/FormatParamInfo.kt b/app/src/main/java/com/chiller3/bcr/format/FormatParamInfo.kt
@@ -74,4 +74,4 @@ object NoParamInfo : FormatParamInfo(0u) {
     override fun toNearest(param: UInt): UInt = param
 
     override fun format(param: UInt): String = ""
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/format/MediaCodecEncoder.kt b/app/src/main/java/com/chiller3/bcr/format/MediaCodecEncoder.kt
@@ -125,4 +125,4 @@ class MediaCodecEncoder(
             return codec
         }
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/format/MediaMuxerContainer.kt b/app/src/main/java/com/chiller3/bcr/format/MediaMuxerContainer.kt
@@ -33,4 +33,4 @@ class MediaMuxerContainer(
     override fun writeSamples(trackIndex: Int, byteBuffer: ByteBuffer,
                               bufferInfo: MediaCodec.BufferInfo) =
         muxer.writeSampleData(trackIndex, byteBuffer, bufferInfo)
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/format/OpusFormat.kt b/app/src/main/java/com/chiller3/bcr/format/OpusFormat.kt
@@ -20,7 +20,7 @@ object OpusFormat : Format() {
     override val mimeTypeContainer: String = "audio/ogg"
     override val mimeTypeAudio: String = MediaFormat.MIMETYPE_AUDIO_OPUS
     override val passthrough: Boolean = false
-    override val supported: Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+    override val supported: Boolean = true
 
     override fun updateMediaFormat(mediaFormat: MediaFormat, param: UInt) {
         mediaFormat.apply {
@@ -29,7 +29,6 @@ object OpusFormat : Format() {
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.Q)
     override fun getContainer(fd: FileDescriptor): Container =
         MediaMuxerContainer(fd, MediaMuxer.OutputFormat.MUXER_OUTPUT_OGG)
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/format/PassthroughEncoder.kt b/app/src/main/java/com/chiller3/bcr/format/PassthroughEncoder.kt
@@ -63,4 +63,4 @@ class PassthroughEncoder(
 
         numFrames += frames
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/format/SampleRate.kt b/app/src/main/java/com/chiller3/bcr/format/SampleRate.kt
@@ -39,4 +39,4 @@ value class SampleRate(val value: UInt) {
             return default
         }
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/format/WaveContainer.kt b/app/src/main/java/com/chiller3/bcr/format/WaveContainer.kt
@@ -129,4 +129,4 @@ class WaveContainer(private val fd: FileDescriptor) : Container {
         private val FMT_MAGIC = ubyteArrayOf(0x66u, 0x6du, 0x74u, 0x20u) // "fmt "
         private val DATA_MAGIC = ubyteArrayOf(0x64u, 0x61u, 0x74u, 0x61u) // data
     }
-}
+}
diff --git a/app/src/main/java/com/chiller3/bcr/format/WaveFormat.kt b/app/src/main/java/com/chiller3/bcr/format/WaveFormat.kt
@@ -21,4 +21,4 @@ object WaveFormat : Format() {
 
     override fun getContainer(fd: FileDescriptor): Container =
         WaveContainer(fd)
-}
+}
diff --git a/app/src/main/res/layout/bottom_sheet_chip.xml b/app/src/main/res/layout/bottom_sheet_chip.xml
@@ -2,4 +2,4 @@
 <com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/Widget.Material3.Chip.Filter"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content" />
+    android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/output_directory_bottom_sheet.xml b/app/src/main/res/layout/output_directory_bottom_sheet.xml
@@ -53,4 +53,4 @@
             android:text="@string/bottom_sheet_reset"
             style="?attr/materialButtonOutlinedStyle" />
     </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/output_format_bottom_sheet.xml b/app/src/main/res/layout/output_format_bottom_sheet.xml
@@ -69,4 +69,4 @@
             android:text="@string/bottom_sheet_reset"
             style="?attr/materialButtonOutlinedStyle" />
     </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
@@ -12,4 +12,4 @@
         android:id="@+id/settings"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-</LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -3,4 +3,4 @@
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -3,4 +3,4 @@
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
+</adaptive-icon>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -3,4 +3,4 @@
     <dimen name="bottom_sheet_overall_padding">28dp</dimen>
     <dimen name="bottom_sheet_title_margin_bottom">16dp</dimen>
     <dimen name="bottom_sheet_section_separation">28dp</dimen>
-</resources>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -5,4 +5,4 @@
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
         <item name="windowActionModeOverlay">true</item>
     </style>
-</resources>
+</resources>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
@@ -42,4 +42,4 @@
             app:title="@string/pref_version_name"
             app:iconSpaceReserved="false" />
     </PreferenceCategory>
-</PreferenceScreen>
+</PreferenceScreen>
diff --git a/app/src/test/java/com/chiller3/bcr/ExampleUnitTest.kt b/app/src/test/java/com/chiller3/bcr/ExampleUnitTest.kt
@@ -14,4 +14,4 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,4 +7,4 @@ plugins {
 
 task<Delete>("clean") {
     delete(rootProject.buildDir)
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,4 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ android {`
`101`	`101`
`102`	`102`	`defaultConfig {`
`103`	`103`	`applicationId = "com.chiller3.bcr"`
`104`		`- minSdk = 28`
	`104`	`+ minSdk = 29`
`105`	`105`	`targetSdk = 33`
`106`	`106`	`versionCode = gitVersionCode`
`107`	`107`	`versionName = gitVersionName`
`@@ -311,4 +311,4 @@ android.applicationVariants.all {`
`311`	`311`	`}`
`312`	`312`	`}`
`313`	`313`	`}`
`314`		`-}`
	`314`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,4 @@ class ExampleInstrumentedTest {`
`21`	`21`	`val appContext = InstrumentationRegistry.getInstrumentation().targetContext`
`22`	`22`	`assertEquals("com.chiller3.bcr", appContext.packageName)`
`23`	`23`	`}`
`24`		`-}`
	`24`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -137,4 +137,4 @@ class ChipGroupCentered(context: Context, attrs: AttributeSet?, defStyleAttr: In`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`}`
`140`		`-}`
	`140`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,4 @@ class LongClickablePreference(context: Context, attrs: AttributeSet?) : Preferen`
`22`	`22`	`interface OnPreferenceLongClickListener {`
`23`	`23`	`fun onPreferenceLongClick(preference: Preference): Boolean`
`24`	`24`	`}`
`25`		`-}`
	`25`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,4 @@ class OpenPersistentDocumentTree : ActivityResultContracts.OpenDocumentTree() {`
`21`	`21`
`22`	`22`	`return intent`
`23`	`23`	`}`
`24`		`-}`
	`24`	`+}`