Fix handling of extended interfaces in Java.registerClass()

Author: oleavr

lib/class-factory.js

@@ -1780,6 +1780,7 @@ function ClassFactory (vm) {
 
     const localHandles = [];
     try {
+      const Class = factory.use('java.lang.Class');
       const Method = env.javaLangReflectMethod();
       const invokeObjectMethodNoArgs = env.vaMethod('pointer', []);
 
@@ -1796,9 +1797,18 @@ function ClassFactory (vm) {
         methods: dexMethods
       };
 
+      const allInterfaces = interfaces.slice();
+      interfaces.forEach(iface => {
+        Array.prototype.slice.call(iface.class.getInterfaces())
+          .forEach(baseIface => {
+            const baseIfaceName = Java.cast(baseIface, Class).getCanonicalName();
+            allInterfaces.push(factory.use(baseIfaceName));
+          });
+      });
+
       const baseMethods = {};
       const pendingOverloads = {};
-      interfaces.forEach(iface => {
+      allInterfaces.forEach(iface => {
         const ifaceHandle = iface.$getClassHandle(env);
         localHandles.push(ifaceHandle);
 

test/re/frida/ClassCreationTest.java

@@ -287,11 +287,10 @@ public void extendingClassCanInvokeSuperMethod() throws ClassNotFoundException,
     // Issue #124
     @Test
     public void derivedInterfaceCanBeImplemented() throws ClassNotFoundException, InstantiationException, IllegalAccessException {
-        loadScript("var Eatable = Java.use('re.frida.Eatable');" +
-                "var Fruit = Java.use('re.frida.Fruit');" +
+        loadScript("var Fruit = Java.use('re.frida.Fruit');" +
                 "var Orange = Java.registerClass({" +
                 "  name: 're.frida.Orange'," +
-                "  implements: [Fruit, Eatable]," +
+                "  implements: [Fruit]," +
                 "  methods: {" +
                 "    getName: function () {" +
                 "      return 'Orange';" +