replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / android / android_api / base / src / main / java / org / iotivity / ca / CaEdrInterface.java

diff --git a/android/android_api/base/src/main/java/org/iotivity/ca/CaEdrInterface.java b/android/android_api/base/src/main/java/org/iotivity/ca/CaEdrInterface.java
index a24e1f3..067dbf3 100644 (file)
--- a/android/android_api/base/src/main/java/org/iotivity/ca/CaEdrInterface.java
+++ b/android/android_api/base/src/main/java/org/iotivity/ca/CaEdrInterface.java
@@ -30,10 +30,16 @@ import android.util.Log;
 
 public class CaEdrInterface {
     private static Context mContext;
+    private static volatile boolean isEdrInitialized = false;
 
     private CaEdrInterface(Context context) {
-        mContext = context;
-        registerIntentFilter();
+        synchronized(CaEdrInterface.class) {
+            mContext = context;
+        }
+        if (!isEdrInitialized) {
+            registerIntentFilter();
+            isEdrInitialized = true;
+        }
     }
 
     private static IntentFilter registerIntentFilter() {
@@ -46,7 +52,10 @@ public class CaEdrInterface {
     }
 
     public static void destroyEdrInterface() {
-        mContext.unregisterReceiver(mReceiver);
+        if (isEdrInitialized) {
+            mContext.unregisterReceiver(mReceiver);
+            isEdrInitialized = false;
+        }
     }
 
     // Network Monitor