mirror/Phone
1
0
Fork 0
mirror of https://github.com/FossifyOrg/Phone.git synced 2026-05-24 00:30:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #126 from Aga-C/call-history-no-limit

Browse Source 
Removed call history limit (#125)
This commit is contained in:
Naveen Singh
2024-03-18 04:27:59 +05:30
committed by GitHub
parent 8417b0e5c6 38de8ee446
commit cba4abc001
2 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/org/fossify/phone/fragments/RecentsFragment.kt
View File

@@ -59,10 +59,9 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
}
override fun refreshItems(callback: (() -> Unit)?) {
val privateCursor = context?.getMyContactsCursor(false, true)
val privateCursor = context?.getMyContactsCursor(favoritesOnly = false, withPhoneNumbersOnly = true)
val groupSubsequentCalls = context?.config?.groupSubsequentCalls ?: false
val querySize = allRecentCalls.size.coerceAtLeast(MIN_RECENTS_THRESHOLD)
RecentsHelper(context).getRecentCalls(groupSubsequentCalls, querySize) { recents ->
RecentsHelper(context).getRecentCalls(groupSubsequentCalls, MIN_RECENTS_THRESHOLD, allRecentCalls) { recents ->
ContactsHelper(context).getContacts(showOnlyContactsWithNumbers = true) { contacts ->
val privateContacts = MyContactsContentProvider.getContacts(context, privateCursor)
@@ -124,10 +123,9 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
}
private fun getMoreRecentCalls() {
val privateCursor = context?.getMyContactsCursor(false, true)
val privateCursor = context?.getMyContactsCursor(favoritesOnly = false, withPhoneNumbersOnly = true)
val groupSubsequentCalls = context?.config?.groupSubsequentCalls ?: false
val querySize = allRecentCalls.size.plus(MIN_RECENTS_THRESHOLD)
RecentsHelper(context).getRecentCalls(groupSubsequentCalls, querySize) { recents ->
RecentsHelper(context).getRecentCalls(groupSubsequentCalls, MIN_RECENTS_THRESHOLD, allRecentCalls) { recents ->
ContactsHelper(context).getContacts(showOnlyContactsWithNumbers = true) { contacts ->
val privateContacts = MyContactsContentProvider.getContacts(context, privateCursor)

46
app/src/main/kotlin/org/fossify/phone/helpers/RecentsHelper.kt
View File

@@ -13,12 +13,20 @@ import org.fossify.phone.extensions.getAvailableSIMCardLabels
import org.fossify.phone.models.RecentCall
class RecentsHelper(private val context: Context) {
private val COMPARABLE_PHONE_NUMBER_LENGTH = 9
private val QUERY_LIMIT = 200
companion object {
private const val COMPARABLE_PHONE_NUMBER_LENGTH = 9
private const val QUERY_LIMIT = 200
}
private val contentUri = Calls.CONTENT_URI
fun getRecentCalls(groupSubsequentCalls: Boolean, maxSize: Int = QUERY_LIMIT, callback: (List<RecentCall>) -> Unit) {
val privateCursor = context.getMyContactsCursor(false, true)
fun getRecentCalls(
groupSubsequentCalls: Boolean,
maxSize: Int = QUERY_LIMIT,
previousRecents: List<RecentCall> = ArrayList(),
callback: (List<RecentCall>) -> Unit,
) {
val privateCursor = context.getMyContactsCursor(favoritesOnly = false, withPhoneNumbersOnly = true)
ensureBackgroundThread {
if (!context.hasPermission(PERMISSION_READ_CALL_LOG)) {
callback(ArrayList())
@@ -31,14 +39,19 @@ class RecentsHelper(private val context: Context) {
contacts.addAll(privateContacts)
}
getRecents(contacts, groupSubsequentCalls, maxSize, callback = callback)
getRecents(contacts, groupSubsequentCalls, maxSize, previousRecents, callback = callback)
}
}
}
@SuppressLint("NewApi")
private fun getRecents(contacts: List<Contact>, groupSubsequentCalls: Boolean, maxSize: Int, callback: (List<RecentCall>) -> Unit) {
private fun getRecents(
contacts: List<Contact>,
groupSubsequentCalls: Boolean,
maxSize: Int,
previousRecents: List<RecentCall>,
callback: (List<RecentCall>) -> Unit,
) {
val recentCalls = mutableListOf<RecentCall>()
var previousRecentCallFrom = ""
var previousStartTS = 0
@@ -61,16 +74,25 @@ class RecentsHelper(private val context: Context) {
accountIdToSimIDMap[it.handle.id] = it.id
}
var selection: String? = null
var selectionParams: Array<String>? = null
val lastDate = previousRecents.lastOrNull()?.startTS
if (lastDate != null) {
selection = "${Calls.DATE} < ?"
selectionParams = arrayOf((lastDate * 1000L).toString())
}
val cursor = if (isNougatPlus()) {
// https://issuetracker.google.com/issues/175198972?pli=1#comment6
val limitedUri = contentUri.buildUpon()
.appendQueryParameter(Calls.LIMIT_PARAM_KEY, QUERY_LIMIT.toString())
.build()
val sortOrder = "${Calls.DATE} DESC"
context.contentResolver.query(limitedUri, projection, null, null, sortOrder)
context.contentResolver.query(limitedUri, projection, selection, selectionParams, sortOrder)
} else {
val sortOrder = "${Calls.DATE} DESC LIMIT $QUERY_LIMIT"
context.contentResolver.query(contentUri, projection, null, null, sortOrder)
context.contentResolver.query(contentUri, projection, selection, selectionParams, sortOrder)
}
val contactsWithMultipleNumbers = contacts.filter { it.phoneNumbers.size > 1 }
@@ -196,7 +218,7 @@ class RecentsHelper(private val context: Context) {
val recentResult = recentCalls
.filter { !context.isNumberBlocked(it.phoneNumber, blockedNumbers) }
callback(recentResult)
callback(previousRecents.plus(recentResult))
}
fun removeRecentCalls(ids: List<Int>, callback: () -> Unit) {
@@ -223,8 +245,8 @@ class RecentsHelper(private val context: Context) {
}
fun restoreRecentCalls(activity: SimpleActivity, objects: List<RecentCall>, callback: () -> Unit) {
activity.handlePermission(PERMISSION_WRITE_CALL_LOG) {
if (it) {
activity.handlePermission(PERMISSION_WRITE_CALL_LOG) { granted ->
if (granted) {
ensureBackgroundThread {
val values = objects
.sortedBy { it.startTS }