Managerのライフサイクルに合わせてコピーガード機能の後始末処理を実行。

Author: masaru-takano

dConnectManager/dConnectManager/dconnect-manager-app/src/main/java/org/deviceconnect/android/manager/DConnectService.java

@@ -92,6 +92,11 @@ public class DConnectService extends Service {
      */
     private DConnectManager mManager;
 
+    /**
+     * Device Connect Manager 本体に設定する Setting プロファイル.
+     */
+    private DConnectSettingProfile mSettingProfile;
+
     /**
      * WakeLockのインスタンス.
      */
@@ -133,6 +138,8 @@ public void onCreate() {
 
         DConnectApplication app = (DConnectApplication) getApplication();
         mSettings = app.getSettings();
+        mSettingProfile = new DConnectSettingProfile();
+        mSettingProfile.start(this, R.drawable.on_icon);
         mManager = new DConnectManager(this, mSettings, app.getPluginManager()) {
             @Override
             public Class<? extends BroadcastReceiver> getDConnectBroadcastReceiverClass() {
@@ -149,7 +156,7 @@ public Class<? extends Activity> getKeywordActivityClass() {
                 return SettingActivity.class;
             }
         };
-        mManager.addProfile(new DConnectSettingProfile(this, R.drawable.on_icon));
+        mManager.addProfile(mSettingProfile);
 
         // Webサーバの起動フラグがONになっている場合には起動を行う
         if (mSettings.isManagerStartFlag()) {
@@ -192,6 +199,7 @@ public int onStartCommand(final Intent intent, final int flags, final int startI
     @Override
     public void onDestroy() {
         stopInternal();
+        mSettingProfile.stop();
         mManager = null;
         super.onDestroy();
     }

dConnectManager/dConnectManager/dconnect-manager-app/src/main/java/org/deviceconnect/android/manager/profile/DConnectSettingProfile.java

@@ -9,7 +9,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.util.Log;
@@ -71,7 +70,7 @@ private static Intent createEventMessage(final Event event) {
         return message;
     }
 
-    public DConnectSettingProfile(final Context context, final int appIconId) {
+    public DConnectSettingProfile() {
         // GET /gotapi/setting/copyGuard
         addApi(new GetApi() {
             @Override