NetworkSecurityConfigの追加。

TakayukiHoshi1984 · TakayukiHoshi1984 · commit d3cbc591783b · 2019-07-04T17:48:16.000+09:00
diff --git a/dConnectDevicePlugin/dConnectDeviceAndroidWear/app/src/main/AndroidManifest.xml b/dConnectDevicePlugin/dConnectDeviceAndroidWear/app/src/main/AndroidManifest.xml
@@ -16,7 +16,8 @@
         android:icon="@drawable/dconnect_icon"
         android:name="android.support.multidex.MultiDexApplication"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <meta-data
             android:name="com.google.android.gms.version"
diff --git a/dConnectDevicePlugin/dConnectDeviceAndroidWear/app/src/main/res/xml/network_security_config.xml b/dConnectDevicePlugin/dConnectDeviceAndroidWear/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
diff --git a/dConnectDevicePlugin/dConnectDeviceAndroidWear/wear-app/src/main/AndroidManifest.xml b/dConnectDevicePlugin/dConnectDeviceAndroidWear/wear-app/src/main/AndroidManifest.xml
@@ -14,7 +14,8 @@
         android:allowBackup="false"
         android:icon="@drawable/dconnect_icon"
         android:label="@string/app_name"
-        android:theme="@android:style/Theme.DeviceDefault">
+        android:theme="@android:style/Theme.DeviceDefault"
+        android:networkSecurityConfig="@xml/network_security_config">
         <meta-data
             android:name="com.google.android.wearable.standalone"
             android:value="false" />
diff --git a/dConnectDevicePlugin/dConnectDeviceAndroidWear/wear-app/src/main/res/xml/network_security_config.xml b/dConnectDevicePlugin/dConnectDeviceAndroidWear/wear-app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/AndroidManifest.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/AndroidManifest.xml
@@ -14,7 +14,8 @@
         android:name=".ChromeCastApplication"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppCompatCustom">
+        android:theme="@style/AppCompatCustom"
+        android:networkSecurityConfig="@xml/network_security_config">
 
 
         <!-- 設定画面 -->
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/xml/network_security_config.xml b/dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
diff --git a/dConnectDevicePlugin/dConnectDeviceHVCC2W/app/src/main/AndroidManifest.xml b/dConnectDevicePlugin/dConnectDeviceHVCC2W/app/src/main/AndroidManifest.xml
@@ -15,7 +15,8 @@
         android:icon="@mipmap/dconnect_icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:networkSecurityConfig="@xml/network_security_config">
 
 
         <receiver android:name="org.deviceconnect.android.deviceplugin.hvcc2w.HVCC2WDeviceServiceProvider" >
diff --git a/dConnectDevicePlugin/dConnectDeviceHVCC2W/app/src/main/res/xml/network_security_config.xml b/dConnectDevicePlugin/dConnectDeviceHVCC2W/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
diff --git a/dConnectDevicePlugin/dConnectDeviceHue/app/src/main/AndroidManifest.xml b/dConnectDevicePlugin/dConnectDeviceHue/app/src/main/AndroidManifest.xml
@@ -12,7 +12,8 @@
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:networkSecurityConfig="@xml/network_security_config">
         <!-- hue Device Plugin Provider. -->
         <receiver android:name="org.deviceconnect.android.deviceplugin.hue.HueDeviceProvider">
             <meta-data
diff --git a/dConnectDevicePlugin/dConnectDeviceHue/app/src/main/res/xml/network_security_config.xml b/dConnectDevicePlugin/dConnectDeviceHue/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
diff --git a/dConnectDevicePlugin/dConnectDeviceIRKit/app/build.gradle b/dConnectDevicePlugin/dConnectDeviceIRKit/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
 
     def getVersionName = { ->
         def version
@@ -17,7 +17,7 @@ android {
     defaultConfig {
         applicationId "org.deviceconnect.android.deviceplugin.irkit"
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName getVersionName()
     }
diff --git a/dConnectDevicePlugin/dConnectDeviceIRKit/app/src/main/AndroidManifest.xml b/dConnectDevicePlugin/dConnectDeviceIRKit/app/src/main/AndroidManifest.xml
@@ -17,7 +17,8 @@
         android:allowBackup="false"
         android:icon="@drawable/dconnect_icon"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <receiver
             android:name=".IRKitDeviceProvider"
diff --git a/dConnectDevicePlugin/dConnectDeviceIRKit/app/src/main/res/xml/network_security_config.xml b/dConnectDevicePlugin/dConnectDeviceIRKit/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
diff --git a/dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/AndroidManifest.xml b/dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/AndroidManifest.xml
@@ -18,7 +18,8 @@
         android:allowBackup="false"
         android:icon="@drawable/dconnect_icon"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
             android:name=".activity.ThetaServiceListActivity"
diff --git a/dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/res/xml/network_security_config.xml b/dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
diff --git a/dConnectSDK/dConnectLibStreaming/librtmpstreaming/build.gradle b/dConnectSDK/dConnectLibStreaming/librtmpstreaming/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
 
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
