diff --git a/.github/workflows/PR-deploy.yml b/.github/workflows/PR-deploy.yml
index d874336e..b3c4a4a4 100644
--- a/.github/workflows/PR-deploy.yml
+++ b/.github/workflows/PR-deploy.yml
@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup JDK
uses: actions/setup-java@v3
@@ -41,35 +41,27 @@ jobs:
run: mv presentation/build/outputs/apk/noAnalytics/release/QUIK-v*-noAnalytics-release.apk presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk
- name: Upload APK
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: apk
path: presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk
release:
- name: Release APK
+ name: validate fdroid APK
needs: apk
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/v')
steps:
- name: Download APK from build
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
name: apk
- name: List files in the APK directory
run: ls -Rla ./
-
- - name: Create and upload pre-release
- uses: softprops/action-gh-release@v1
- with:
- files: presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk
- prerelease: true
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Validate Fastlane Supply Metadata
uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2.0.0
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 73408819..77093508 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -3,8 +3,6 @@ name: Build and Release
on:
workflow_dispatch:
push:
- branches:
- - master
tags:
- "v*"
@@ -14,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup JDK
uses: actions/setup-java@v3
@@ -55,7 +53,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Set release datetime
run: echo "DATETIME=$(date +'%d-%m-%y_%s')" >> $GITHUB_ENV
diff --git a/.github/workflows/build-on-pull.yml b/.github/workflows/build-on-pull.yml
index c153d237..25eaddfe 100644
--- a/.github/workflows/build-on-pull.yml
+++ b/.github/workflows/build-on-pull.yml
@@ -1,6 +1,7 @@
name: Build and Test on Pull Request
on:
+ workflow_dispatch:
pull_request:
branches:
- '**'
@@ -11,21 +12,27 @@ jobs:
steps:
- name: Checkout code
- uses: actions/checkout@v2
-
+ uses: actions/checkout@v4
+
+ - name: Decode Keystore File
+ run: echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > ${{ github.workspace }}/my-release-key.keystore
+
- name: Set up JDK 17
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v4
with:
+ distribution: 'temurin'
java-version: '17'
- name: Build with Gradle
- run: ./gradlew build
-
+ run: |
+ ./gradlew assembleNoAnalyticsDebug \
+ -Dandroid.injected.signing.store.file=${{ github.workspace }}/my-release-key.keystore
+
- name: Run Tests
run: ./gradlew test
- name: Deploy Artifacts
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v4
with:
name: build-artifacts
path: build/libs/
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
index a65cc645..b7fb36b8 100644
--- a/data/src/main/AndroidManifest.xml
+++ b/data/src/main/AndroidManifest.xml
@@ -20,4 +20,8 @@
+
+
+
+
diff --git a/data/src/main/java/com/moez/QKSMS/extensions/UriExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/UriExtensions.kt
index 7ebe330a..2262732c 100644
--- a/data/src/main/java/com/moez/QKSMS/extensions/UriExtensions.kt
+++ b/data/src/main/java/com/moez/QKSMS/extensions/UriExtensions.kt
@@ -18,19 +18,24 @@
*/
package dev.octoshrimpy.quik.extensions
+import android.content.ContentResolver
import android.content.Context
import android.net.Uri
+import androidx.core.net.toFile
fun Uri.resourceExists(context: Context): Boolean {
- // check if resource at uri still exists
+ var retVal: Boolean? = null
try {
- return context.contentResolver.query(
- this, null, null, null, null
- )?.use {
- it.moveToFirst()
- } ?: false
+ when (this.scheme) {
+ ContentResolver.SCHEME_CONTENT -> {
+ retVal = context.contentResolver.query(
+ this, null, null, null, null
+ )?.use { it.moveToFirst() }
+ }
+ ContentResolver.SCHEME_FILE -> retVal = this.toFile().exists()
+ }
+ } catch (e: Exception) { /* nothing */
}
- catch (e: Exception) { /* nothing */ }
- return false
+ return retVal ?: false
}
diff --git a/data/src/main/java/com/moez/QKSMS/manager/BluetoothMicManager.kt b/data/src/main/java/com/moez/QKSMS/manager/BluetoothMicManager.kt
new file mode 100644
index 00000000..8ddeec27
--- /dev/null
+++ b/data/src/main/java/com/moez/QKSMS/manager/BluetoothMicManager.kt
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2025
+ *
+ * This file is part of QUIK.
+ *
+ * QUIK is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QUIK is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QUIK. If not, see .
+ */
+package com.moez.QKSMS.manager
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.media.AudioDeviceInfo
+import android.media.AudioManager
+import android.media.AudioManager.GET_DEVICES_INPUTS
+
+
+// this class is, by design, as simplistic it can be to support easy and fast connection
+// for recording from first bluetooth mic found, if any
+
+class BluetoothMicManager(
+ private val context: Context,
+ private val callbacks: Callbacks
+)
+ : BroadcastReceiver() {
+ interface Callbacks {
+ fun onNoDeviceFound()
+ fun onDeviceFound(device: AudioDeviceInfo?)
+ fun onConnecting(device: AudioDeviceInfo?)
+ fun onConnected(device: AudioDeviceInfo?)
+ fun onDisconnected(device: AudioDeviceInfo?)
+ }
+
+ init {
+ // register for bluetooth sco broadcast intents
+ context.registerReceiver(this, IntentFilter().apply {
+ addAction(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED)
+ })
+ }
+
+ enum class StartBluetoothDevice {
+ NoDevice,
+ Connecting,
+ Connected
+ }
+
+ var device: AudioDeviceInfo? = null
+ private set
+
+ private var hadFirstStickyIntent: Boolean = false
+ private var closed: Boolean = false
+
+ fun close() {
+ if (closed)
+ return
+ closed = true
+
+ device = null
+ (context.getSystemService(Context.AUDIO_SERVICE) as AudioManager).stopBluetoothSco()
+ context.unregisterReceiver(this)
+ }
+
+ // note: caller may get connected() callback before this method returns if this method is
+ // called from a non-UI thread and the UI thread processes a sticky sco_audio_state_connected
+ fun startBluetoothDevice() {
+ device = null
+ val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+
+ // get all audio input devices
+ val allAudioInputDevices = audioManager.getDevices(GET_DEVICES_INPUTS)
+
+// @TODO: below code can be used for BLE headset devices if and when one can be tested
+// : also need to register for BLE headset intent broadcasts and other things later
+// // firstly (highest priority), check for a connected BLE headset input device
+// for (btInputDevice in allAudioInputDevices) {
+// if (btInputDevice.type == AudioDeviceInfo.TYPE_BLE_HEADSET) {
+// device = btInputDevice
+// break
+// }
+// }
+
+ // if no ble device found, check if platform supports non-phone-call sco connections
+ if ((device == null) &&
+ (audioManager.isBluetoothScoAvailableOffCall)) {
+ // find first SCO input device
+ for (btInputDevice in allAudioInputDevices) {
+ if (btInputDevice.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO) {
+ device = btInputDevice
+ break
+ }
+ }
+ }
+
+ // if no usable device found, callback to caller and return
+ if (device == null) {
+ callbacks.onNoDeviceFound()
+ return
+ }
+
+ // callback that a sco capable bluetooth device was found
+ callbacks.onDeviceFound(device)
+
+ // start sco connection on bluetooth device (even if already started by other app)
+ try { // see https://stackoverflow.com/a/26929741 for try-catch reason
+ audioManager.startBluetoothSco()
+ }
+ catch (e: Exception) { /* nothing */ }
+
+ // if sco device is already on (maybe by another app?) callback now
+ if (audioManager.isBluetoothScoOn)
+ callbacks.onConnected(device)
+ }
+
+ override fun onReceive(context: Context, intent: Intent) {
+ if (!hadFirstStickyIntent) {
+ hadFirstStickyIntent = true
+ return
+ }
+
+ // if sco connection state has changed
+ val action = intent.action ?: return
+ if (action == AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED) {
+ when (intent.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, -1)) {
+ AudioManager.SCO_AUDIO_STATE_CONNECTED -> callbacks.onConnected(device)
+ AudioManager.SCO_AUDIO_STATE_CONNECTING -> callbacks.onConnecting(device)
+ AudioManager.SCO_AUDIO_STATE_DISCONNECTED -> {
+ close()
+ callbacks.onDisconnected(device)
+ }
+ }
+ }
+ }
+}
diff --git a/data/src/main/java/com/moez/QKSMS/manager/MediaRecorderManager.kt b/data/src/main/java/com/moez/QKSMS/manager/MediaRecorderManager.kt
new file mode 100644
index 00000000..a33e8b27
--- /dev/null
+++ b/data/src/main/java/com/moez/QKSMS/manager/MediaRecorderManager.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2025
+ *
+ * This file is part of QUIK.
+ *
+ * QUIK is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QUIK is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QUIK. If not, see .
+ */
+package com.moez.QKSMS.manager
+
+import android.content.Context
+import android.media.AudioDeviceInfo
+import android.media.MediaRecorder
+import android.net.Uri
+import android.os.Build
+import androidx.core.net.toUri
+import java.io.File
+import java.util.UUID
+
+object MediaRecorderManager : MediaRecorder() {
+
+ enum class RecordingState {
+ Initial,
+ DataSourceConfigured,
+ Prepared,
+ Recording,
+ Error
+ }
+
+ const val AUDIO_FILE_PREFIX = "recorded-"
+ const val AUDIO_FILE_SUFFIX = ".3ga"
+
+ var recordingState: RecordingState = RecordingState.Initial
+ private set
+
+ var uri: Uri = Uri.EMPTY
+ private set
+
+ fun stopRecording(): Uri {
+ return try {
+ if (recordingState == RecordingState.Recording)
+ stop()
+
+ reset()
+ recordingState = RecordingState.Initial
+
+ uri
+ }
+ catch (e: Exception) {
+ Uri.EMPTY
+ }
+ }
+
+ fun startRecording(context: Context, preferredAudioDevice: AudioDeviceInfo? = null): Uri {
+ return try {
+ val file = File(
+ context.cacheDir,
+ AUDIO_FILE_PREFIX + UUID.randomUUID() + AUDIO_FILE_SUFFIX
+ )
+
+ // ensure stopped before using again
+ stopRecording()
+
+ // configure
+ setAudioSource(AudioSource.MIC)
+ setOutputFormat(OutputFormat.THREE_GPP)
+ setAudioEncoder(AudioEncoder.AMR_WB)
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+ preferredDevice = preferredAudioDevice
+ }
+
+ recordingState = RecordingState.DataSourceConfigured
+
+ setOutputFile(file.path)
+
+ prepare()
+ recordingState = RecordingState.Prepared
+
+ start()
+ recordingState = RecordingState.Recording
+
+ uri = file.toUri()
+
+ uri
+ }
+ catch (e: Exception) {
+ Uri.EMPTY
+ }
+ }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt
index 21955eb0..bc5a6f1c 100644
--- a/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt
@@ -72,6 +72,10 @@ class PermissionManagerImpl @Inject constructor(private val context: Context) :
return hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
}
+ override fun hasRecordAudio(): Boolean {
+ return hasPermission(Manifest.permission.RECORD_AUDIO)
+ }
+
override fun hasExactAlarms(): Boolean {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
return true
diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
index 5771cff3..a93be920 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
@@ -47,6 +47,7 @@ import dev.octoshrimpy.quik.compat.TelephonyCompat
import dev.octoshrimpy.quik.extensions.anyOf
import dev.octoshrimpy.quik.extensions.isImage
import dev.octoshrimpy.quik.extensions.isVideo
+import dev.octoshrimpy.quik.extensions.resourceExists
import dev.octoshrimpy.quik.manager.ActiveConversationManager
import dev.octoshrimpy.quik.manager.KeyManager
import dev.octoshrimpy.quik.model.Attachment
@@ -368,32 +369,35 @@ class MessageRepositoryImpl @Inject constructor(
parts += MMSPart("text", ContentType.TEXT_PLAIN, bytes)
}
- // Attach those that can't be compressed (ie. everything but not images)
+ // Attach those that can't be compressed (ie. everything but images)
parts += attachments
- // filter out images
+ // filter in non-images only
.filter { !it.isImage(context) }
- // filter out items that have no data available (ie user may have deleted
- // the file from storage)
- .filter { it.getResourceBytes(context).isNotEmpty() }
+ // filter in only items that exist (user may have deleted the file)
+ .filter { it.uri.resourceExists(context) }
.map {
remainingBytes -= it.getResourceBytes(context).size
- MMSPart(
+ val mmsPart = MMSPart(
it.getName(context),
it.getType(context),
it.getResourceBytes(context)
)
+
+ // release the attachment hold on the image bytes so the GC can reclaim
+ it.releaseResourceBytes()
+
+ mmsPart
}
val imageBytesByAttachment = attachments
- // filter out non-images
+ // filter in images only
.filter { it.isImage(context) }
- // filter out items that have no data available (ie user may have deleted
- // the file from storage)
- .filter { it.getResourceBytes(context).isNotEmpty() }
+ // filter in only items that exist (user may have deleted the file)
+ .filter { it.uri.resourceExists(context) }
.associateWith {
when (it.getType(context) == "image/gif") {
- true -> ImageUtils.getScaledGif(context, it.getUri(), maxWidth, maxHeight)
- false -> ImageUtils.getScaledImage(context, it.getUri(), maxWidth, maxHeight)
+ true -> ImageUtils.getScaledGif(context, it.uri, maxWidth, maxHeight)
+ false -> ImageUtils.getScaledImage(context, it.uri, maxWidth, maxHeight)
}
}
.toMutableMap()
@@ -401,7 +405,7 @@ class MessageRepositoryImpl @Inject constructor(
val imageByteCount = imageBytesByAttachment.values.sumOf { it.size }
if (imageByteCount > remainingBytes) {
imageBytesByAttachment.forEach { (attachment, originalBytes) ->
- val uri = attachment.getUri() ?: return@forEach
+ val uri = attachment.uri ?: return@forEach
val maxBytes = originalBytes.size / imageByteCount.toFloat() * remainingBytes
// Get the image dimensions
@@ -429,11 +433,14 @@ class MessageRepositoryImpl @Inject constructor(
attempts++
scaledBytes = when (attachment.getType(context) == "image/gif") {
- true -> ImageUtils.getScaledGif(context, attachment.getUri(), newWidth, newHeight)
- false -> ImageUtils.getScaledImage(context, attachment.getUri(), newWidth, newHeight)
+ true -> ImageUtils.getScaledGif(context, attachment.uri, newWidth, newHeight)
+ false -> ImageUtils.getScaledImage(context, attachment.uri, newWidth, newHeight)
}
Timber.d("Compression attempt $attempts: ${scaledBytes.size / 1024}/${maxBytes.toInt() / 1024}Kb ($width*$height -> $newWidth*$newHeight)")
+
+ // release the attachment hold on the image bytes so the GC can reclaim
+ attachment.releaseResourceBytes()
}
Timber.v("Compressed ${originalBytes.size / 1024}Kb to ${scaledBytes.size / 1024}Kb with a target size of ${maxBytes.toInt() / 1024}Kb in $attempts attempts")
diff --git a/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt
index c407c526..676133c8 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt
@@ -69,6 +69,10 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep
disposables.add(subscription)
}
+ override fun deleteScheduledMessages(ids: List) {
+ ids.forEach { deleteScheduledMessage(it) }
+ }
+
// Ensure to clear disposables when the repository is no longer needed
fun clearDisposables() {
disposables.clear()
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt
index b6443e75..23fc11d8 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt
@@ -53,6 +53,9 @@ class SendMessage @Inject constructor(
}
messageRepo.sendMessage(params.subId, threadId, params.addresses, params.body, params.attachments,
params.delay)
+
+ // delete attachment local files, if any, because they're saved to mms db by now
+ params.attachments.forEach { it.removeCacheFile() }
}
.mapNotNull {
// If the threadId wasn't provided, then it's probably because it doesn't exist in Realm.
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SendScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SendScheduledMessage.kt
index 0047fdd8..7ea2ec33 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/SendScheduledMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SendScheduledMessage.kt
@@ -47,11 +47,11 @@ class SendScheduledMessage @Inject constructor(
}
.map { message ->
val threadId = TelephonyCompat.getOrCreateThreadId(context, message.recipients)
- val attachments = message.attachments.mapNotNull(Uri::parse).map { Attachment(it) }
+ val attachments = message.attachments.mapNotNull(Uri::parse).map { Attachment(context, it) }
SendMessage.Params(message.subId, threadId, message.recipients, message.body, attachments)
}
.flatMap(sendMessage::buildObservable)
.doOnNext { scheduledMessageRepo.deleteScheduledMessage(params) }
}
-}
\ No newline at end of file
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt
index c1a30c63..c1c0432a 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt
@@ -36,6 +36,8 @@ interface PermissionManager {
fun hasStorage(): Boolean
+ fun hasRecordAudio(): Boolean
+
fun hasExactAlarms(): Boolean
}
diff --git a/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt b/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt
index 5b1cdaaa..257a1ba4 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt
@@ -18,51 +18,79 @@
*/
package dev.octoshrimpy.quik.model
+import android.annotation.SuppressLint
+import android.content.ContentResolver
import android.content.Context
import android.net.Uri
import android.os.Build
+import android.provider.ContactsContract
import android.provider.OpenableColumns
+import android.webkit.MimeTypeMap
+import androidx.core.net.toFile
import androidx.core.view.inputmethod.InputContentInfoCompat
-class Attachment(
- private val uri: Uri? = null,
- private val inputContent: InputContentInfoCompat? = null
+@SuppressLint("Range")
+class Attachment (
+ context: Context,
+ var uri: Uri = Uri.EMPTY,
+ inputContent: InputContentInfoCompat? = null
) {
private var resourceBytes: ByteArray? = null
- fun getUri(): Uri {
- return (
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
- inputContent?.contentUri ?: uri ?: Uri.EMPTY
- else uri ?: Uri.EMPTY
- )
+ init {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
+ uri = inputContent?.contentUri ?: uri
+
+ // if constructed with a uri to a contact, convert uri to associated vcard uri
+ if (context.contentResolver.getType(uri)?.lowercase() ==
+ ContactsContract.Contacts.CONTENT_ITEM_TYPE
+ ) {
+ uri = try {
+ Uri.withAppendedPath(
+ ContactsContract.Contacts.CONTENT_VCARD_URI,
+ context.contentResolver.query(
+ uri, null, null, null, null
+ )?.use {
+ it.moveToFirst()
+ it.getString(it.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY)) ?: ""
+ }
+ )
+ } catch (e: Exception) {
+ Uri.EMPTY
+ }
+ }
}
fun getType(context: Context): String {
- return context.contentResolver.getType(getUri()) ?: "application/octect-stream"
+ var retVal: String? = null
+ when (uri.scheme) {
+ ContentResolver.SCHEME_CONTENT -> retVal = context.contentResolver.getType(uri)
+ ContentResolver.SCHEME_FILE -> retVal =
+ MimeTypeMap.getSingleton().getMimeTypeFromExtension(uri.toFile().extension)
+ }
+ return retVal ?: "application/octect-stream"
}
fun getName(context: Context): String {
+ var retVal: String? = null
try {
- context.contentResolver.query(
- getUri(),
- arrayOf(OpenableColumns.DISPLAY_NAME),
- null,
- null,
- null
- )
- ?.use { cursor ->
- val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
- if (nameIndex == -1)
- return "unknown"
- cursor.moveToFirst()
- return cursor.getString(nameIndex) ?: "unknown"
- }
- }
- catch (e: Exception) { /* nothing*/ }
+ when (uri.scheme) {
+ ContentResolver.SCHEME_CONTENT -> {
+ context.contentResolver.query(
+ uri, arrayOf(OpenableColumns.DISPLAY_NAME), null, null, null
+ )?.use {
+ it.moveToFirst()
+ retVal = it.getString(it.getColumnIndex(OpenableColumns.DISPLAY_NAME))
+ }
+ }
- return "unknown"
+ ContentResolver.SCHEME_FILE -> retVal = uri.toFile().name
+ }
+ } catch (e: Exception) { /* nothing */
+ }
+
+ return retVal ?: "unknown"
}
fun isVCard(context: Context): Boolean {
@@ -75,53 +103,60 @@ class Attachment(
}
fun isAudio(context: Context): Boolean {
- val mimeType = getType(context)
- return (mimeType.startsWith("audio/"))
+ return (getType(context).startsWith("audio/"))
}
fun isImage(context: Context): Boolean {
- val mimeType = getType(context)
- return (mimeType.startsWith("image/"))
+ return (getType(context).startsWith("image/"))
}
fun getSize(context: Context): Long {
+ var retVal: Long? = null
try {
- context.contentResolver.query(
- getUri(),
- arrayOf(OpenableColumns.SIZE),
- null,
- null,
- null
- )
- ?.use {
- val sizeIndex = it.getColumnIndex(OpenableColumns.SIZE)
- if (sizeIndex == -1)
- return -1
- it.moveToFirst()
- return it.getLong(sizeIndex)
- }
- }
- catch (e: Exception) { /* nothing */ }
+ when (uri.scheme) {
+ ContentResolver.SCHEME_CONTENT -> {
+ context.contentResolver.query(
+ uri, arrayOf(OpenableColumns.SIZE), null, null, null
+ )?.use {
+ it.moveToFirst()
+ retVal = it.getLong(it.getColumnIndex(OpenableColumns.SIZE))
+ }
+ }
- return -1
+ ContentResolver.SCHEME_FILE -> retVal = uri.toFile().length()
+ }
+ } catch (e: Exception) { /* nothing */
+ }
+
+ return retVal ?: -1
}
fun getResourceBytes(context: Context): ByteArray {
if (resourceBytes != null)
return resourceBytes!!
- resourceBytes = ByteArray(0)
-
try {
- context.contentResolver.openInputStream(getUri())?.use {
+ context.contentResolver.openInputStream(uri)?.use {
resourceBytes = it.readBytes()
}
} catch (e: Exception) {
}
- return resourceBytes!!
+ return resourceBytes ?: ByteArray(0)
}
+ fun releaseResourceBytes() {
+ resourceBytes = null
+ }
+
+ fun removeCacheFile(): Boolean {
+ // all file:// scheme files are local to the app cache dir, so can be deleted
+ if (uri.scheme == ContentResolver.SCHEME_FILE) {
+ return try { uri.toFile().delete() }
+ catch (e: Exception) { false }
+ }
+
+ return false
+ }
}
-class Attachments(attachments: List) : List by attachments
diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt
index cd78bc08..e4150aa9 100644
--- a/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt
@@ -50,4 +50,7 @@ interface ScheduledMessageRepository {
*/
fun deleteScheduledMessage(id: Long)
+ // delete multiple scheduled messages by id list
+ fun deleteScheduledMessages(ids: List)
+
}
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt
index ce10166d..df81490f 100644
--- a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt
+++ b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt
@@ -108,6 +108,9 @@ class Preferences @Inject constructor(
val black = rxPrefs.getBoolean("black", false)
val autoColor = rxPrefs.getBoolean("autoColor", true)
val systemFont = rxPrefs.getBoolean("systemFont", false)
+ val showStt = rxPrefs.getBoolean("showStt", true)
+ val showSttOffsetX = rxPrefs.getFloat("showSttOffsetX", Float.MIN_VALUE)
+ val showSttOffsetY = rxPrefs.getFloat("showSttOffsetY", Float.MIN_VALUE)
val textSize = rxPrefs.getInteger("textSize", TEXT_SIZE_NORMAL)
val blockingManager = rxPrefs.getInteger("blockingManager", BLOCKING_MANAGER_QKSMS)
val drop = rxPrefs.getBoolean("drop", false)
diff --git a/metadata/en-US/images/icon.png b/metadata/en-US/images/icon.png
index 3cae4497..689d040b 100644
Binary files a/metadata/en-US/images/icon.png and b/metadata/en-US/images/icon.png differ
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt
index 752419c1..52469313 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt
@@ -39,7 +39,7 @@ import javax.inject.Inject
data class MenuItem(val title: String, val actionId: Int)
-class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter