refactor: wait for rime deployment completed before doing any work

Author: goofyz

app/src/main/java/com/osfans/trime/ime/core/Trime.java

@@ -253,12 +253,14 @@ public void onWindowShown() {
     } else {
       Timber.i("onWindowShown...");
     }
-    isWindowShown = true;
 
-    updateComposing();
+    if (RimeWrapper.INSTANCE.isReady() && activeEditorInstance != null) {
+      isWindowShown = true;
+      updateComposing();
 
-    for (EventListener listener : eventListeners) {
-      listener.onWindowShown();
+      for (EventListener listener : eventListeners) {
+        listener.onWindowShown();
+      }
     }
   }
 
@@ -352,27 +354,33 @@ public void restartSystemStartTimingSync() { // 防止重启系统 强行停止
 
   @Override
   public void onCreate() {
+    super.onCreate();
     // MUST WRAP all code within Service onCreate() in try..catch to prevent any crash loops
     try {
       // Additional try..catch wrapper as the event listeners chain or the super.onCreate() method
       // could crash
       //  and lead to a crash loop
-      try {
-        Timber.d("onCreate");
-        textInputManager = TextInputManager.Companion.getInstance(UiUtil.INSTANCE.isDarkMode(this));
-        activeEditorInstance = new EditorInstance(this);
-        inputFeedbackManager = new InputFeedbackManager(this);
-        liquidKeyboard = new LiquidKeyboard(this);
-        restartSystemStartTimingSync();
-      } catch (Exception e) {
-        Timber.e(e);
-        super.onCreate();
-        return;
-      }
-      super.onCreate();
-      for (EventListener listener : eventListeners) {
-        listener.onCreate();
-      }
+      Timber.d("onCreate");
+      final InputMethodService context = this;
+      RimeWrapper.INSTANCE.startup(
+          () -> {
+            Timber.d("Back to Trime.onCreate");
+            textInputManager =
+                TextInputManager.Companion.getInstance(UiUtil.INSTANCE.isDarkMode(context));
+            activeEditorInstance = new EditorInstance(context);
+            inputFeedbackManager = new InputFeedbackManager(context);
+            liquidKeyboard = new LiquidKeyboard(context);
+            restartSystemStartTimingSync();
+
+            try {
+              for (EventListener listener : eventListeners) {
+                listener.onCreate();
+              }
+            } catch (Exception e) {
+              Timber.e(e);
+            }
+            Timber.d("Trime.onCreate  completed");
+          });
     } catch (Exception e) {
       Timber.e(e);
     }
@@ -724,44 +732,51 @@ public void onComputeInsets(InputMethodService.Insets outInsets) {
 
   @Override
   public View onCreateInputView() {
-    Timber.e("onCreateInputView()");
+    Timber.d("onCreateInputView()");
     // 初始化键盘布局
     super.onCreateInputView();
-    updateDarkMode();
-    Theme.get(darkMode).initCurrentColors(darkMode);
-
-    inputRootBinding = InputRootBinding.inflate(LayoutInflater.from(this));
-    mainKeyboardView = inputRootBinding.main.mainKeyboardView;
+    RimeWrapper.INSTANCE.runAfterStarted(
+        () -> {
+          inputRootBinding = InputRootBinding.inflate(LayoutInflater.from(this));
+
+          mainKeyboardView = inputRootBinding.main.mainKeyboardView;
+          // 初始化候选栏
+          mCandidateRoot = inputRootBinding.main.candidateView.candidateRoot;
+          mCandidate = inputRootBinding.main.candidateView.candidates;
+
+          // 候选词悬浮窗的容器
+          compositionRootBinding = CompositionRootBinding.inflate(LayoutInflater.from(this));
+          mComposition = compositionRootBinding.compositions;
+          mPopupWindow = new PopupWindow(compositionRootBinding.compositionRoot);
+          mPopupWindow.setClippingEnabled(false);
+          mPopupWindow.setInputMethodMode(PopupWindow.INPUT_METHOD_NOT_NEEDED);
+          if (VERSION.SDK_INT >= VERSION_CODES.M) {
+            mPopupWindow.setWindowLayoutType(
+                WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG);
+          }
+          hideCompositionView();
+          mTabRoot = inputRootBinding.symbol.tabView.tabRoot;
 
-    // 初始化候选栏
-    mCandidateRoot = inputRootBinding.main.candidateView.candidateRoot;
-    mCandidate = inputRootBinding.main.candidateView.candidates;
+          updateDarkMode();
+          Theme.get(darkMode).initCurrentColors(darkMode);
 
-    // 候选词悬浮窗的容器
-    compositionRootBinding = CompositionRootBinding.inflate(LayoutInflater.from(this));
-    mComposition = compositionRootBinding.compositions;
-    mPopupWindow = new PopupWindow(compositionRootBinding.compositionRoot);
-    mPopupWindow.setClippingEnabled(false);
-    mPopupWindow.setInputMethodMode(PopupWindow.INPUT_METHOD_NOT_NEEDED);
-    if (VERSION.SDK_INT >= VERSION_CODES.M) {
-      mPopupWindow.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG);
-    }
-    hideCompositionView();
-    mTabRoot = inputRootBinding.symbol.tabView.tabRoot;
+          liquidKeyboard.setKeyboardView(inputRootBinding.symbol.liquidKeyboardView);
+          tabView = inputRootBinding.symbol.tabView.tabs;
 
-    liquidKeyboard.setKeyboardView(inputRootBinding.symbol.liquidKeyboardView);
-    tabView = inputRootBinding.symbol.tabView.tabs;
+          for (EventListener listener : eventListeners) {
+            assert inputRootBinding != null;
+            listener.onInitializeInputUi(inputRootBinding);
+          }
+          loadBackground();
 
-    for (EventListener listener : eventListeners) {
-      assert inputRootBinding != null;
-      listener.onInitializeInputUi(inputRootBinding);
-    }
-    loadBackground();
+          KeyboardSwitcher.newOrReset();
 
-    KeyboardSwitcher.newOrReset();
+          setInputView(inputRootBinding.inputRoot);
+          Timber.d("onCreateInputView - really ended");
+        });
     Timber.i("onCreateInputView() finish");
 
-    return inputRootBinding.inputRoot;
+    return null;
   }
 
   public void setShowComment(boolean show_comment) {
@@ -786,87 +801,94 @@ public void onStartInputView(EditorInfo attribute, boolean restarting) {
     Timber.d("onStartInputView: restarting=%s", restarting);
     editorInfo = attribute;
 
-    if (updateDarkMode()) {
-      initKeyboardDarkMode(darkMode);
-    }
-
-    inputFeedbackManager.resumeSoundPool();
-    inputFeedbackManager.resetPlayProgress();
-    for (EventListener listener : eventListeners) {
-      listener.onStartInputView(activeEditorInstance, restarting);
-    }
-    if (getPrefs().getOther().getShowStatusBarIcon()) {
-      showStatusIcon(R.drawable.ic_trime_status); // 狀態欄圖標
-    }
-    bindKeyboardToInputView();
-    // if (!restarting) setNavBarColor();
-    setCandidatesViewShown(!Rime.isEmpty()); // 軟鍵盤出現時顯示候選欄
+    RimeWrapper.INSTANCE.runAfterStarted(
+        () -> {
+          if (updateDarkMode()) {
+            initKeyboardDarkMode(darkMode);
+          }
 
-    if ((attribute.imeOptions & EditorInfo.IME_FLAG_NO_ENTER_ACTION)
-        == EditorInfo.IME_FLAG_NO_ENTER_ACTION) {
-      mainKeyboardView.resetEnterLabel();
-    } else {
-      mainKeyboardView.setEnterLabel(
-          attribute.imeOptions & EditorInfo.IME_MASK_ACTION, attribute.actionLabel);
-    }
+          inputFeedbackManager.resumeSoundPool();
+          inputFeedbackManager.resetPlayProgress();
+          for (EventListener listener : eventListeners) {
+            listener.onStartInputView(activeEditorInstance, restarting);
+          }
+          if (getPrefs().getOther().getShowStatusBarIcon()) {
+            showStatusIcon(R.drawable.ic_trime_status); // 狀態欄圖標
+          }
+          bindKeyboardToInputView();
+          // if (!restarting) setNavBarColor();
+          setCandidatesViewShown(!Rime.isEmpty()); // 軟鍵盤出現時顯示候選欄
 
-    switch (attribute.inputType & InputType.TYPE_MASK_VARIATION) {
-      case InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS:
-      case InputType.TYPE_TEXT_VARIATION_PASSWORD:
-      case InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD:
-      case InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS:
-      case InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD:
-        Timber.i(
-            "EditorInfo: private;"
-                + " packageName="
-                + attribute.packageName
-                + "; fieldName="
-                + attribute.fieldName
-                + "; actionLabel="
-                + attribute.actionLabel
-                + "; inputType="
-                + attribute.inputType
-                + "; VARIATION="
-                + (attribute.inputType & InputType.TYPE_MASK_VARIATION)
-                + "; CLASS="
-                + (attribute.inputType & InputType.TYPE_MASK_CLASS)
-                + "; ACTION="
-                + (attribute.imeOptions & EditorInfo.IME_MASK_ACTION));
-        normalTextEditor = false;
-        break;
+          if ((attribute.imeOptions & EditorInfo.IME_FLAG_NO_ENTER_ACTION)
+              == EditorInfo.IME_FLAG_NO_ENTER_ACTION) {
+            mainKeyboardView.resetEnterLabel();
+          } else {
+            mainKeyboardView.setEnterLabel(
+                attribute.imeOptions & EditorInfo.IME_MASK_ACTION, attribute.actionLabel);
+          }
 
-      default:
-        Timber.i(
-            "EditorInfo: normal;"
-                + " packageName="
-                + attribute.packageName
-                + "; fieldName="
-                + attribute.fieldName
-                + "; actionLabel="
-                + attribute.actionLabel
-                + "; inputType="
-                + attribute.inputType
-                + "; VARIATION="
-                + (attribute.inputType & InputType.TYPE_MASK_VARIATION)
-                + "; CLASS="
-                + (attribute.inputType & InputType.TYPE_MASK_CLASS)
-                + "; ACTION="
-                + (attribute.imeOptions & EditorInfo.IME_MASK_ACTION));
-
-        if ((attribute.imeOptions & EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING)
-            == EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING) {
-          //  应用程求以隐身模式打开键盘应用程序
-          normalTextEditor = false;
-          Timber.d("EditorInfo: normal -> private, IME_FLAG_NO_PERSONALIZED_LEARNING");
-        } else if (attribute.packageName.equals(BuildConfig.APPLICATION_ID)
-            || getPrefs().getClipboard().getDraftExcludeApp().contains(attribute.packageName)) {
-          normalTextEditor = false;
-          Timber.d("EditorInfo: normal -> exclude, packageName=%s", attribute.packageName);
-        } else {
-          normalTextEditor = true;
-          DraftHelper.INSTANCE.onInputEventChanged();
-        }
-    }
+          switch (attribute.inputType & InputType.TYPE_MASK_VARIATION) {
+            case InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS:
+            case InputType.TYPE_TEXT_VARIATION_PASSWORD:
+            case InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD:
+            case InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS:
+            case InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD:
+              Timber.i(
+                  "EditorInfo: private;"
+                      + " packageName="
+                      + attribute.packageName
+                      + "; fieldName="
+                      + attribute.fieldName
+                      + "; actionLabel="
+                      + attribute.actionLabel
+                      + "; inputType="
+                      + attribute.inputType
+                      + "; VARIATION="
+                      + (attribute.inputType & InputType.TYPE_MASK_VARIATION)
+                      + "; CLASS="
+                      + (attribute.inputType & InputType.TYPE_MASK_CLASS)
+                      + "; ACTION="
+                      + (attribute.imeOptions & EditorInfo.IME_MASK_ACTION));
+              normalTextEditor = false;
+              break;
+
+            default:
+              Timber.i(
+                  "EditorInfo: normal;"
+                      + " packageName="
+                      + attribute.packageName
+                      + "; fieldName="
+                      + attribute.fieldName
+                      + "; actionLabel="
+                      + attribute.actionLabel
+                      + "; inputType="
+                      + attribute.inputType
+                      + "; VARIATION="
+                      + (attribute.inputType & InputType.TYPE_MASK_VARIATION)
+                      + "; CLASS="
+                      + (attribute.inputType & InputType.TYPE_MASK_CLASS)
+                      + "; ACTION="
+                      + (attribute.imeOptions & EditorInfo.IME_MASK_ACTION));
+
+              if ((attribute.imeOptions & EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING)
+                  == EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING) {
+                //  应用程求以隐身模式打开键盘应用程序
+                normalTextEditor = false;
+                Timber.d("EditorInfo: normal -> private, IME_FLAG_NO_PERSONALIZED_LEARNING");
+              } else if (attribute.packageName.equals(BuildConfig.APPLICATION_ID)
+                  || getPrefs()
+                      .getClipboard()
+                      .getDraftExcludeApp()
+                      .contains(attribute.packageName)) {
+                normalTextEditor = false;
+                Timber.d("EditorInfo: normal -> exclude, packageName=%s", attribute.packageName);
+              } else {
+                normalTextEditor = true;
+                DraftHelper.INSTANCE.onInputEventChanged();
+              }
+          }
+        });
+    RimeWrapper.INSTANCE.runCheck();
   }
 
   @Override