Fix AndroidOS.IBinder NDK compatibility

Author: colemancda

Sources/AndroidOS/IBinderNDK.swift

@@ -10,7 +10,7 @@
 import Android
 #endif
 import SwiftJava
-import CSwiftJavaJNI
+import SwiftJavaJNICore
 import AndroidBinder
 
 // MARK: - NDK Parcel
@@ -32,64 +32,9 @@ public extension AndroidOS.IBinder {
 public extension AndroidBinder {
 
     /// Converts an `android.os.IBinder` object into an `AIBinder*` object.
-    convenience init(_ javaObject: AndroidOS.IBinder) {
-        self.init(javaObject.javaThis, environment: javaObject.javaEnvironment)
+    static func fromJava(_ javaObject: AndroidOS.IBinder) -> AndroidBinder? {
+        AndroidBinder.fromJava(javaObject.javaThis, environment: javaObject.javaEnvironment)
     }
 }
 
-internal extension AndroidBinder {
-    
-    /**
-     * Converts an `android.os.IBinder` object into an `AIBinder* object`.
-     *
-     * If the binder is null, null is returned. If this binder object was originally an
-     * AIBinder object, the original object is returned. The returned object has one refcount
-     * associated with it, and so this should be accompanied with an `AIBinder_decStrong` call.
-     *
-     * Available since API level 29.
-     *
-     * \param env Java environment. Must not be null.
-     * \param binder android.os.IBinder java object.
-     *
-     * \return an AIBinder object representing the Java binder object. If either parameter is null, or
-     * the Java object is of the wrong type, this will return null.
-     */
-    convenience init(_ javaObject: jobject, environment: JNIEnvironment) {
-        guard let pointer = AIBinder_fromJavaBinder(environment, javaObject) else {
-            fatalError("Unable to initialize from Java object")
-        }
-        self.init(pointer)
-    }
-    
-    /**
-     * Converts an `AIBinder*` object into an `android.os.IBinder` object.
-     *
-     * If the binder is null, null is returned. If this binder object was originally an IBinder object,
-     * the original java object will be returned.
-     *
-     * WARNING: this function returns global and local references. This can be
-     * figured out using GetObjectRefType. Though, when this function is called
-     * from within a Java context, the local ref will automatically be cleaned
-     * up. If this is called outside of a Java frame,
-     * PushObjectFrame/PopObjectFrame can simulate this automatic cleanup.
-     *
-     * Available since API level 29.
-     *
-     * \param env Java environment. Must not be null.
-     * \param binder the object to convert.
-     *
-     * \return an android.os.IBinder object or null if the parameters were null.
-     */
-    func toJavaObject(environment: JNIEnvironment) -> jobject {
-        withUnsafePointer {
-            AIBinder_toJavaBinder(environment, $0)
-        }
-    }
-}
-
-#if !os(Android)
-func AIBinder_fromJavaBinder(_ environment: JNIEnvironment?, _ javaObject: jobject) -> OpaquePointer? { fatalError("stub") }
-
-func AIBinder_toJavaBinder(_ environment: JNIEnvironment?, _ ndkObject: OpaquePointer?) -> jobject { fatalError("stub") }
-#endif
 #endif