@hanwha-ss1/plugin 0.2.9 → 0.3.0

package/android/src/main/java/com/plugin/bio/BioAuthManager.java

@@ -58,7 +58,7 @@ public class BioAuthManager {
         Intent intent;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             BiometricManager biometricManager = BiometricManager.from(activity);
-            switch (biometricManager.canAuthenticate(BIOMETRIC_STRONG)) {
+            switch (biometricManager.canAuthenticate(DEVICE_CREDENTIAL)) {
                 case BiometricManager.BIOMETRIC_SUCCESS:
                     Log.d("MY_APP_TAG", "App can authenticate using biometrics.");
                     return true;
@@ -72,10 +72,10 @@ public class BioAuthManager {
                     // Prompts the user to create credentials that your app accepts.
                     Log.d("MY_APP_TAG", "enrolled biometric doesn't existed. please enroll");
 
-                    intent = new Intent(Settings.ACTION_FINGERPRINT_ENROLL);
-                    intent.putExtra(Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED,
-                            BIOMETRIC_STRONG | DEVICE_CREDENTIAL);
-                    activity.startActivityForResult(intent, REQUEST_FINGERPRINT_ENROLLMENT_AUTH);
+//                    intent = new Intent(Settings.ACTION_FINGERPRINT_ENROLL);
+//                    intent.putExtra(Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED,
+//                            BIOMETRIC_STRONG | DEVICE_CREDENTIAL);
+//                    activity.startActivityForResult(intent, REQUEST_FINGERPRINT_ENROLLMENT_AUTH);
                     return false;
             }
         } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -97,8 +97,8 @@ public class BioAuthManager {
             // 등록된 지문이 없는 경우
             else if (!fingerprintManager.hasEnrolledFingerprints()) {
                 Log.d("fingerprint", "please enroll fingerprint");
-                intent = new Intent(Settings.ACTION_SECURITY_SETTINGS);
-                activity.startActivityForResult(intent, REQUEST_FINGERPRINT_ENROLLMENT_AUTH);
+//                intent = new Intent(Settings.ACTION_SECURITY_SETTINGS);
+//                activity.startActivityForResult(intent, REQUEST_FINGERPRINT_ENROLLMENT_AUTH);
                 return false;
             }
             return true;
@@ -151,13 +151,13 @@ public class BioAuthManager {
                         // DEVICE_CREDENTIAL 및 BIOMETRIC_STRING | DEVICE_CREDENTIAL 은 안드로이드 10 이하에서 지원되지 않는다.
                         // 안드로이드 10 이하에서 PIN 이나 패턴, 비밀번호가 있는지 확인하려면 KeyguardManager.isDeviceSecure() 함수를 사용할 것
                         promptInfo = new BiometricPrompt.PromptInfo.Builder()
-                                .setTitle("지문 인증")
-                                .setSubtitle("기기에 등록된 지문을 이용하여 지문을 인증해주세요.")
-                                .setDescription("생체 인증")
+                                .setTitle("생체 인증")
+                                .setSubtitle("기기에 등록된 생체 인증을 이용하여 인증해주세요.")
+//                                .setDescription("생체 인증")
                                 // BIOMETRIC_STRONG 은 안드로이드 11 에서 정의한 클래스 3 생체 인식을 사용하는 인증 - 암호회된 키 필요
                                 // BIOMETRIC_WEAK 은 안드로이드 11 에서 정의한 클래스 2 생체 인식을 사용하는 인증 - 암호화된 키까지 필요하지는 않음
                                 // DEVICE_CREDENTIAL 은 화면 잠금 사용자 인증 정보를 사용하는 인증 - 사용자의 PIN, 패턴 또는 비밀번호
-                                .setAllowedAuthenticators(BIOMETRIC_STRONG)
+//                                .setAllowedAuthenticators(DEVICE_CREDENTIAL)
                                 .setConfirmationRequired(false) // 명시적인 사용자 작업 ( 생체 인식 전 한번더 체크 ) 없이 인증할건지 default : true
                                 .setNegativeButtonText("취소")
                                 .build();

package/android/src/main/java/com/plugin/contact/ContactPlugin.java

@@ -19,33 +19,4 @@ public class ContactPlugin extends Plugin{
         ret.put("value", implementation.echo(value));
         call.resolve(ret);
     }
-
-    @PluginMethod
-    public void addContact(PluginCall call) {
-        String name = call.getString("name");
-        String mobile = call.getString("phone");
-        String phone = call.getString("ext");
-        String department = call.getString("dept");
-        String email = call.getString("email");
-        if(implementation == null) {
-            implementation = new Contact();
-        }
-        implementation.save(getActivity(), name, email, mobile, phone, department, new Contact.OnResult() {
-            @Override
-            public void onSuccess() {
-                JSObject ret = new JSObject();
-                ret.put("result", true);
-                ret.put("message", "완료");
-                call.resolve(ret);
-            }
-
-            @Override
-            public void onFail() {
-                JSObject ret = new JSObject();
-                ret.put("result", false);
-                ret.put("message", "존재하는 번호입니다.");
-                call.resolve(ret);
-            }
-        });
-    }
 }

package/android/src/main/java/com/plugin/linker/LinkerPlugin.java

@@ -6,12 +6,16 @@ import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
 import com.plugin.bio.Bio;
+import com.plugin.contact.Contact;
+import com.plugin.openbrowser.OpenBrowser;
 
 
 @CapacitorPlugin(name = "Plugin")
 public class LinkerPlugin extends Plugin{
     private Linker implementation = new Linker();
     private Bio bioImplementation = new Bio();
+    private Contact contactImplementation = new Contact();
+    private OpenBrowser openBrowserImplementation = new OpenBrowser();
 
     @PluginMethod
     public void echo(PluginCall call) {
@@ -71,4 +75,43 @@ public class LinkerPlugin extends Plugin{
             }
         });
     }
+
+    @PluginMethod
+    public void addContact(PluginCall call) {
+        String name = call.getString("name");
+        String mobile = call.getString("phone");
+        String phone = call.getString("ext");
+        String department = call.getString("dept");
+        String email = call.getString("email");
+        if(contactImplementation == null) {
+            contactImplementation = new Contact();
+        }
+        contactImplementation.save(getActivity(), name, email, mobile, phone, department, new Contact.OnResult() {
+            @Override
+            public void onSuccess() {
+                JSObject ret = new JSObject();
+                ret.put("result", true);
+                ret.put("message", "완료");
+                call.resolve(ret);
+            }
+
+            @Override
+            public void onFail() {
+                JSObject ret = new JSObject();
+                ret.put("result", false);
+                ret.put("message", "존재하는 번호입니다.");
+                call.resolve(ret);
+            }
+        });
+    }
+
+    @PluginMethod
+    public void open(PluginCall call) {
+        String url = call.getString("url");
+        boolean isExternal = call.getBoolean("ext");
+        if(openBrowserImplementation == null) {
+            openBrowserImplementation = new OpenBrowser();
+        }
+        openBrowserImplementation.open(getActivity(), url, isExternal);
+    }
 }

package/android/src/main/java/com/plugin/openbrowser/OpenBrowserPlugin.java

@@ -19,14 +19,4 @@ public class OpenBrowserPlugin extends Plugin {
         ret.put("value", implementation.echo(value));
         call.resolve(ret);
     }
-
-    @PluginMethod
-    public void open(PluginCall call) {
-        String url = call.getString("url");
-        boolean isExternal = call.getBoolean("ext");
-        if(implementation == null) {
-            implementation = new OpenBrowser();
-        }
-        implementation.open(getActivity(), url, isExternal);
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanwha-ss1/plugin",
-  "version": "0.2.9",
+  "version": "0.3.0",
   "description": "Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",