Merge pull request #668 from TakayukiHoshi1984/modify_background_activity

Systemプロファイルの挙動改善

Author: nobuo-kobayashi

dConnectDevicePlugin/dConnectDeviceAndroidWear/app/build.gradle

@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.3'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.4'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'
 

dConnectDevicePlugin/dConnectDeviceChromeCast/app/build.gradle

@@ -63,7 +63,7 @@ repositories {
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.3'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.4'
     implementation 'com.google.android.gms:play-services-cast-framework:17.1.0'
 }
 

dConnectDevicePlugin/dConnectDeviceFaBo/app/build.gradle

@@ -56,7 +56,7 @@ repositories {
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
-    api 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.3'
+    api 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.4'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

dConnectDevicePlugin/dConnectDeviceHOGP/plugin/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.3'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.4'
 }
 
 repositories {

dConnectDevicePlugin/dConnectDeviceHeartRate/app/build.gradle

@@ -64,7 +64,7 @@ repositories {
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.3'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.4'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle

@@ -75,7 +75,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation "androidx.preference:preference:1.1.0"
     implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:1.6.7'
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.3'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.4'
     implementation project(':dconnect-demo-lib')
 }
 

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/mediaplayer/HostMediaPlayerManager.java

@@ -29,6 +29,7 @@
 import org.deviceconnect.android.deviceplugin.host.BuildConfig;
 import org.deviceconnect.android.deviceplugin.host.HostDeviceApplication;
 import org.deviceconnect.android.deviceplugin.host.HostDevicePlugin;
+import org.deviceconnect.android.deviceplugin.host.R;
 import org.deviceconnect.android.event.Event;
 import org.deviceconnect.android.event.EventManager;
 import org.deviceconnect.android.message.DevicePluginContext;
@@ -171,9 +172,6 @@ public class HostMediaPlayerManager {
     /** Notification Id */
     private final int NOTIFICATION_ID = 3539;
 
-    /** Notification Content */
-    private final String NOTIFICATION_CONTENT = "Host Media Player Profileからの起動要求";
-
     /** ロガー. */
     private final Logger mLogger = Logger.getLogger("host.dplugin");
 
@@ -511,7 +509,8 @@ public int playMedia(final Intent response) {
                     sendOnStatusChangeEvent("play");
                 } else {
                     NotificationUtils.createNotificationChannel(getContext());
-                    NotificationUtils.notify(getContext(), NOTIFICATION_ID, 0, mIntent, NOTIFICATION_CONTENT);
+                    NotificationUtils.notify(getContext(), NOTIFICATION_ID, 0, mIntent,
+                            getContext().getString(R.string.host_notification_mediaplayer_warnning));
                 }
             }
 

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/profile/HostCanvasProfile.java

@@ -13,6 +13,7 @@
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.deviceconnect.android.deviceplugin.host.HostDeviceApplication;
+import org.deviceconnect.android.deviceplugin.host.R;
 import org.deviceconnect.android.deviceplugin.host.activity.CanvasProfileActivity;
 import org.deviceconnect.android.deviceplugin.host.canvas.CanvasDrawImageObject;
 import org.deviceconnect.android.message.MessageUtils;
@@ -50,9 +51,6 @@ public class HostCanvasProfile extends CanvasProfile {
     /** Notification Id */
     private final int NOTIFICATION_ID = 3517;
 
-    /** Notification Content */
-    private final String NOTIFICATION_CONTENT = "Host Canvas Profileからの起動要求";
-
     private final DConnectApi mDrawImageApi = new PostApi() {
 
         @Override
@@ -177,7 +175,8 @@ private void drawImage(Intent response, String uri, CanvasDrawImageObject.Mode e
                 getContext().startActivity(intent);
             } else {
                 NotificationUtils.createNotificationChannel(getContext());
-                NotificationUtils.notify(getContext(),  NOTIFICATION_ID, 0, intent, NOTIFICATION_CONTENT);
+                NotificationUtils.notify(getContext(),  NOTIFICATION_ID, 0, intent,
+                        getContext().getString(R.string.host_notification_canvas_warnning));
             }
         }
 

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/profile/HostConnectionProfile.java

@@ -17,6 +17,7 @@
 import android.util.Log;
 
 import org.deviceconnect.android.deviceplugin.host.BuildConfig;
+import org.deviceconnect.android.deviceplugin.host.R;
 import org.deviceconnect.android.deviceplugin.host.activity.BluetoothManageActivity;
 import org.deviceconnect.android.event.EventError;
 import org.deviceconnect.android.event.EventManager;
@@ -26,6 +27,7 @@
 import org.deviceconnect.android.profile.api.DeleteApi;
 import org.deviceconnect.android.profile.api.GetApi;
 import org.deviceconnect.android.profile.api.PutApi;
+import org.deviceconnect.android.util.NotificationUtils;
 import org.deviceconnect.message.DConnectMessage;
 import org.deviceconnect.message.intent.message.IntentDConnectMessage;
 
@@ -41,6 +43,8 @@ public class HostConnectionProfile extends ConnectionProfile {
 
     /** Bluetooth Adapter. */
     private BluetoothAdapter mBluetoothAdapter;
+    /** Notification Id */
+    private final int NOTIFICATION_ID = 3527;
 
     private final DConnectApi mGetWifiApi = new GetApi() {
 
@@ -377,7 +381,13 @@ protected void setEnabledBluetooth(final Intent request, final Intent response,
                 Intent intent = new Intent(request);
                 intent.setClass(getContext(), BluetoothManageActivity.class);
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                getContext().startActivity(intent);
+                if(Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                    this.getContext().startActivity(intent);
+                } else {
+                    NotificationUtils.createNotificationChannel(getContext());
+                    NotificationUtils.notify(getContext(), NOTIFICATION_ID, 0, intent,
+                            getContext().getString(R.string.host_notification_connection_warnning));
+                }
 
                 setResult(response, IntentDConnectMessage.RESULT_OK);
             } else {

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/profile/HostGeolocationProfile.java

@@ -22,6 +22,7 @@
 import androidx.core.app.ActivityCompat;
 
 import org.deviceconnect.android.activity.PermissionUtility;
+import org.deviceconnect.android.deviceplugin.host.R;
 import org.deviceconnect.android.deviceplugin.host.activity.GeolocationAlertDialogActivity;
 import org.deviceconnect.android.event.Event;
 import org.deviceconnect.android.event.EventError;
@@ -61,9 +62,6 @@ public class HostGeolocationProfile extends GeolocationProfile implements Locati
     /** Notification Id */
     private final int NOTIFICATION_ID = 3533;
 
-    /** Notification Content */
-    private final String NOTIFICATION_CONTENT = "Host Geolocation Profileからの起動要求";
-
     /**
      * Constructor.
      */
@@ -214,7 +212,8 @@ private LocationManager getLocationManager(final Intent response) {
                 getContext().startActivity(intent);
             } else {
                 NotificationUtils.createNotificationChannel(getContext());
-                NotificationUtils.notify(getContext(), NOTIFICATION_ID, 0, intent, NOTIFICATION_CONTENT);
+                NotificationUtils.notify(getContext(), NOTIFICATION_ID, 0, intent,
+                        getContext().getString(R.string.host_notification_geolocation_warnning));
             }
         }
         return mLocationManager;