fix: crashes without sound yaml file

osfans · Dec 25, 2021 · a6e4a1d · a6e4a1d
1 parent 9e4fc05
commit a6e4a1d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/core/Trime.java b/app/src/main/java/com/osfans/trime/ime/core/Trime.java
@@ -683,7 +683,7 @@ public void setShowComment(boolean show_comment) {
   @Override
   public void onStartInputView(EditorInfo attribute, boolean restarting) {
     super.onStartInputView(attribute, restarting);
-    Sound.get().resetProgress();
+    Sound.resetProgress();
     for (EventListener listener : eventListeners) {
       if (listener != null) listener.onStartInputView(activeEditorInstance, restarting);
     }

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/InputFeedbackManager.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/InputFeedbackManager.kt
@@ -91,7 +91,7 @@ class InputFeedbackManager(
     fun keyPressSound(keyCode: Int? = null) {
         if (prefs.keyboard.soundEnabled) {
             val soundVolume = prefs.keyboard.soundVolume
-            if (Sound.get().isEnable)
+            if (Sound.isEnable())
                 Sound.get().play(keyCode, soundVolume)
             else {
                 if (soundVolume > 0) {

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/Sound.java b/app/src/main/java/com/osfans/trime/ime/keyboard/Sound.java
@@ -33,12 +33,13 @@ public static Sound get(String soundPackageName) {
     return self;
   }
 
-  public boolean isEnable() {
-    return enable;
+  public static boolean isEnable() {
+    if (self == null) return false;
+    return self.enable;
   }
 
-  public void resetProgress() {
-    progress = 0;
+  public static void resetProgress() {
+    if (self != null) self.progress = 0;
   }
 
   @SuppressWarnings("unchecked")