Fixed: Fix termux-call-log api IllegalArgumentException: Invalid token LIMIT on Android 11+ since limit and offset are being passed as sort parameters instead of query parameters

agnostic-apollo · agnostic-apollo · commit 11eff5658cae · 2022-09-24T02:32:17.000+05:00
Closes #434
diff --git a/app/src/main/java/com/termux/api/apis/CallLogAPI.java b/app/src/main/java/com/termux/api/apis/CallLogAPI.java
@@ -38,10 +38,12 @@ public void writeJson(JsonWriter out) throws Exception {
     }
 
     private static void getCallLogs(Context context, JsonWriter out, int offset, int limit) throws IOException {
-        ContentResolver cr = context.getContentResolver();
-        String sortOrder = "date DESC LIMIT + " + limit + " OFFSET " + offset;
+        ContentResolver contentResolver = context.getContentResolver();
 
-        try (Cursor cur = cr.query(CallLog.Calls.CONTENT_URI, null, null, null, sortOrder)) {
+        try (Cursor cur = contentResolver.query(CallLog.Calls.CONTENT_URI.buildUpon().
+                appendQueryParameter(CallLog.Calls.LIMIT_PARAM_KEY, String.valueOf(limit)).
+                appendQueryParameter(CallLog.Calls.OFFSET_PARAM_KEY, String.valueOf(offset))
+                .build(), null, null, null, "date DESC")) {
             cur.moveToLast();
 
             int nameIndex = cur.getColumnIndex(CallLog.Calls.CACHED_NAME);
@@ -62,7 +64,7 @@ private static void getCallLogs(Context context, JsonWriter out, int offset, int
                 out.name("type").value(getCallTypeString(cur.getInt(callTypeIndex)));
                 out.name("date").value(getDateString(cur.getLong(dateIndex), dateFormat));
                 out.name("duration").value(getTimeString(cur.getInt(durationIndex)));
-                out.name("sim_id").value(cur.getString(simTypeIndex));                
+                out.name("sim_id").value(cur.getString(simTypeIndex));
 
                 cur.moveToPrevious();
                 out.endObject();
