Press harder on enabling on-screen kbd

Author: d4vidi

e2e/Keyboard.test.js

@@ -2,7 +2,7 @@ import { default as TestIDs, default as testIDs } from '../playground/src/testID
 import { device } from 'detox';
 import Utils from './Utils';
 
-const { elementByLabel, elementById } = Utils;
+const { elementByLabel, elementById, retry, sleep } = Utils;
 
 const KBD_OBSCURED_TEXT = 'Keyboard Demo';
 
@@ -34,16 +34,29 @@ const androidDriver = {
       // Not initialized
       return;
     }
-    await this.adb.shell(this.adbName, 'settings put Secure show_ime_with_hard_keyboard 1');
+
+    await this._setOnscreenKeyboard(true);
   },
 
   async restoreOnScreenKeyboard() {
     if (!this.adb) {
       // Not initialized
       return;
     }
-    await this.adb.shell(this.adbName, `settings put Secure show_ime_with_hard_keyboard ${this.kbdEnabled}`);
+    await this._setOnscreenKeyboard(this.kbdEnabled);
   },
+
+  async _setOnscreenKeyboard(_value) {
+    const value = (!!Number(_value) ? '1' : '0');
+
+    await retry( { retries: 9 }, async () => {
+      await this.adb.shell(this.adbName, `settings put Secure show_ime_with_hard_keyboard ${value}`);
+      await sleep(1000);
+
+      const result = await this.adb.shell(this.adbName, 'settings get Secure show_ime_with_hard_keyboard');
+      return result === value;
+    });
+  }
 }
 
 describe.e2e('Keyboard', () => {

e2e/Utils.js

@@ -34,6 +34,18 @@ function bitmapDiff(imagePath, expectedImagePath, ssimThreshold = SSIM_SCORE_THR
   }
 }
 
+async function retry({ retries = 3, delay = 1000 }, func) {
+  let tries = 0;
+  let result;
+  do {
+    result = await func();
+  } while (!result && ++tries < retries);
+
+  if (!result) {
+    throw new Error(`Failed even after ${retries} retries`);
+  }
+}
+
 const utils = {
   elementByLabel: (label) => {
     // uncomment for running tests with rn's new arch
@@ -59,6 +71,7 @@ const utils = {
     }
   },
   sleep: (ms) => new Promise((res) => setTimeout(res, ms)),
+  retry,
   expectImagesToBeEqual: (imagePath, expectedImagePath) => {
     bitmapDiff(imagePath, expectedImagePath);