Fix crash on duplicate keys, #96

Cosmic-Ide · Aug 19, 2023 · 65534bf · 65534bf
1 parent bf6c4a7
commit 65534bf
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/util/src/main/java/org/cosmicide/rewrite/plugin/api/PluginLoader.kt b/util/src/main/java/org/cosmicide/rewrite/plugin/api/PluginLoader.kt
@@ -13,6 +13,7 @@ import de.Maxr1998.modernpreferences.PreferenceScreen
 import org.cosmicide.rewrite.util.MultipleDexClassLoader
 import java.io.File
 import java.lang.reflect.Modifier
+import java.lang.reflect.InvocationTargetException
 
 object PluginLoader {
     @JvmStatic
@@ -62,8 +63,13 @@ object PluginLoader {
                 )
                 if (Modifier.isStatic(method.modifiers)) {
                     Log.d("Plugin", "Registering preferences for plugin ${plugin.name}")
-                    prefsMethods.add {
-                        prefMethod.invoke(null, this)
+                    try {
+                        prefsMethods.add {
+                            prefMethod.invoke(null, this)
+                        }
+                    } catch (e: InvocationTargetException) {
+                        // usually occurs when prefs is already registered. For more info, see #96)
+                        e.printStackTrace()
                     }
                 } else {
                     Log.e("Plugin", "registerPreferences method is not static")
@@ -77,4 +83,4 @@ object PluginLoader {
             Log.e("Plugin", "Failed to load plugin ${plugin.name}", it)
         }
     }
-}
+}