Implemented API 31+ vibration service code to replace depreciated code

codenameone · Oct 28, 2023 · 80b4b3f · 80b4b3f
1 parent 39f3132
commit 80b4b3f
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 533 deletions.
diff --git a/CodenameOne/CodenameOne.iml b/CodenameOne/CodenameOne.iml
diff --git a/CodenameOneDesigner/CodenameOneDesigner.iml b/CodenameOneDesigner/CodenameOneDesigner.iml
diff --git a/Ports/Android/CompatLibs/CompatLibs.iml b/Ports/Android/CompatLibs/CompatLibs.iml
diff --git a/Ports/Android/src/com/codename1/impl/android/AndroidImplementation.java b/Ports/Android/src/com/codename1/impl/android/AndroidImplementation.java
@@ -2610,7 +2610,18 @@ public int getSoftkeyCount() {
     public void vibrate(int duration) {
         if (!this.vibrateInitialized) {
             try {
-                v = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE);
+                /**
+                 * Implementation takes into account for retrocompatability if the
+                 * SDK ever needs to be reverted to pre 31 for some reason?
+                 */
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                    // SDK >= 31
+                    VibratorManager vibratorManager = (VibratorManager) getSystemService(Context.VIBRATOR_MANAGER_SERVICE);
+                    v = vibratorManager.getDefaultVibrator();
+                } else {
+                    // Backward compatability for SDK < 31
+                    v = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE);
+                }
             } catch (Throwable e) {
                 Log.e("Codename One", "problem with virbrator(0)", e);
             } finally {

diff --git a/Ports/BlackBerryOS_5/BlackBerryOS_5.iml b/Ports/BlackBerryOS_5/BlackBerryOS_5.iml
diff --git a/Ports/J2ME/J2ME.iml b/Ports/J2ME/J2ME.iml
diff --git a/Ports/JavaSEWithSVGSupport/JavaSEWithSVGSupport.iml b/Ports/JavaSEWithSVGSupport/JavaSEWithSVGSupport.iml
diff --git a/Ports/retro/retro.iml b/Ports/retro/retro.iml
diff --git a/Samples/SampleProjectTemplate/SampleProjectTemplate.iml b/Samples/SampleProjectTemplate/SampleProjectTemplate.iml
diff --git a/Samples/Samples.iml b/Samples/Samples.iml