9 files changed, 18 insertions, 16 deletions
diff --git a/srcs/juloo.keyboard2/ClipboardPinView.java b/srcs/juloo.keyboard2/ClipboardPinView.java
index 26833d6..65f2f44 100644
--- a/srcs/juloo.keyboard2/ClipboardPinView.java
+++ b/srcs/juloo.keyboard2/ClipboardPinView.java
@@ -86,7 +86,7 @@ public final class ClipboardPinView extends NonScrollListView
       arr.put(entries.get(i));
     store.edit()
       .putString(PERSIST_PREF, arr.toString())
-      .commit();
+      .apply();
   }
 
   class ClipboardPinEntriesAdapter extends BaseAdapter
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 577ace5..64e2d87 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -207,7 +207,7 @@ public final class Config
   public void set_clipboard_history_enabled(boolean e)
   {
     clipboard_history_enabled = e;
-    _prefs.edit().putBoolean("clipboard_history_enabled", e).commit();
+    _prefs.edit().putBoolean("clipboard_history_enabled", e).apply();
   }
 
   private float get_dip_pref(DisplayMetrics dm, String pref_name, float def)
diff --git a/srcs/juloo.keyboard2/CustomLayoutEditDialog.java b/srcs/juloo.keyboard2/CustomLayoutEditDialog.java
index f051668..d63cf40 100644
--- a/srcs/juloo.keyboard2/CustomLayoutEditDialog.java
+++ b/srcs/juloo.keyboard2/CustomLayoutEditDialog.java
@@ -96,6 +96,9 @@ public class CustomLayoutEditDialog
       _on_change_listener = l;
     }
 
+    /** A mutable Rect object that is used during onDraw. */
+    Rect _clip_bounds = new Rect();
+
     @Override
     protected void onDraw(Canvas canvas)
     {
@@ -105,17 +108,17 @@ public class CustomLayoutEditDialog
       setPadding((int)(((int)Math.log10(line_count) + 1 + 1) * digit_width), 0, 0, 0);
       super.onDraw(canvas);
       _ln_paint.setColor(getPaint().getColor());
-      Rect clip_bounds = canvas.getClipBounds();
+      canvas.getClipBounds(_clip_bounds);
       Layout layout = getLayout();
-      int offset = clip_bounds.left + (int)(digit_width / 2.f);
-      int line = layout.getLineForVertical(clip_bounds.top);
+      int offset = _clip_bounds.left + (int)(digit_width / 2.f);
+      int line = layout.getLineForVertical(_clip_bounds.top);
       int skipped = line;
       while (line < line_count)
       {
         int baseline = getLineBounds(line, null);
         canvas.drawText(String.valueOf(line), offset, baseline, _ln_paint);
         line++;
-        if (baseline >= clip_bounds.bottom)
+        if (baseline >= _clip_bounds.bottom)
           break;
       }
     }
diff --git a/srcs/juloo.keyboard2/DirectBootAwarePreferences.java b/srcs/juloo.keyboard2/DirectBootAwarePreferences.java
index df1612e..4806788 100644
--- a/srcs/juloo.keyboard2/DirectBootAwarePreferences.java
+++ b/srcs/juloo.keyboard2/DirectBootAwarePreferences.java
@@ -1,6 +1,5 @@
 package juloo.keyboard2;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build.VERSION;
@@ -8,7 +7,6 @@ import android.preference.PreferenceManager;
 import java.util.Map;
 import java.util.Set;
 
-@TargetApi(24)
 public final class DirectBootAwarePreferences
 {
   /* On API >= 24, preferences are read from the device protected storage. This
diff --git a/srcs/juloo.keyboard2/FoldStateTracker.java b/srcs/juloo.keyboard2/FoldStateTracker.java
index 60933c9..f112243 100644
--- a/srcs/juloo.keyboard2/FoldStateTracker.java
+++ b/srcs/juloo.keyboard2/FoldStateTracker.java
@@ -2,6 +2,7 @@ package juloo.keyboard2;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.os.Build.VERSION;
 import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter;
 import androidx.window.layout.DisplayFeature;
 import androidx.window.layout.FoldingFeature;
@@ -24,6 +25,8 @@ public class FoldStateTracker {
     }
 
     public static boolean isFoldableDevice(Context context) {
+        if (VERSION.SDK_INT < 30)
+          return false;
         return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_SENSOR_HINGE_ANGLE);
     }
 
diff --git a/srcs/juloo.keyboard2/KeyEventHandler.java b/srcs/juloo.keyboard2/KeyEventHandler.java
index 21a60c1..fc3a641 100644
--- a/srcs/juloo.keyboard2/KeyEventHandler.java
+++ b/srcs/juloo.keyboard2/KeyEventHandler.java
@@ -456,7 +456,7 @@ public final class KeyEventHandler
     if (et == null) return;
     final int curs = et.selectionStart;
     // Notify the receiver as Android's [onUpdateSelection] is not triggered.
-    if (conn.setSelection(curs, curs));
+    if (conn.setSelection(curs, curs))
       _recv.selection_state_changed(false);
   }
 
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index f0408e0..1efe0f5 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -1,6 +1,5 @@
 package juloo.keyboard2;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -139,7 +138,6 @@ public class Keyboard2 extends InputMethodService
     return Arrays.asList();
   }
 
-  @TargetApi(12)
   private ExtraKeys extra_keys_of_subtype(InputMethodSubtype subtype)
   {
     String extra_keys = subtype.getExtraValueOf("extra_keys");
@@ -162,7 +160,6 @@ public class Keyboard2 extends InputMethodService
     return (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);
   }
 
-  @TargetApi(12)
   private InputMethodSubtype defaultSubtypes(InputMethodManager imm, List<InputMethodSubtype> enabled_subtypes)
   {
     if (VERSION.SDK_INT < 24)
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index 1532970..58c689d 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -18,6 +18,7 @@ import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.view.WindowMetrics;
 import java.util.Arrays;
+import java.util.List;
 
 public class Keyboard2View extends View
   implements View.OnTouchListener, Pointers.IPointerEventHandler
@@ -292,6 +293,8 @@ public class Keyboard2View extends View
     setMeasuredDimension(width, height);
   }
 
+  Rect _cached_exclusion_rect = new Rect();
+  List<Rect> _cached_exclusion_rects = Arrays.asList(_cached_exclusion_rect);
   @Override
   public void onLayout(boolean changed, int left, int top, int right, int bottom)
   {
@@ -300,12 +303,12 @@ public class Keyboard2View extends View
     if (VERSION.SDK_INT >= 29)
     {
       // Disable the back-gesture on the keyboard area
-      Rect keyboard_area = new Rect(
+      _cached_exclusion_rect.set(
           left + (int)_marginLeft,
           top + (int)_config.marginTop,
           right - (int)_marginRight,
           bottom - (int)_marginBottom);
-      setSystemGestureExclusionRects(Arrays.asList(keyboard_area));
+      setSystemGestureExclusionRects(_cached_exclusion_rects);
     }
   }
 
diff --git a/srcs/juloo.keyboard2/LauncherActivity.java b/srcs/juloo.keyboard2/LauncherActivity.java
index 3a039c1..ee769fb 100644
--- a/srcs/juloo.keyboard2/LauncherActivity.java
+++ b/srcs/juloo.keyboard2/LauncherActivity.java
@@ -1,6 +1,5 @@
 package juloo.keyboard2;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.drawable.Animatable;
@@ -103,7 +102,6 @@ public class LauncherActivity extends Activity implements Handler.Callback
     return (Animatable)img.getDrawable();
   }
 
-  @TargetApi(28)
   final class Tryhere_OnUnhandledKeyEventListener implements View.OnUnhandledKeyEventListener
   {
     public boolean onUnhandledKeyEvent(View v, KeyEvent ev)