Merge branch 'release/v0.0.8'

kshoji · kshoji · commit 31cae54158ea · 2015-04-30T12:11:05.000+09:00
Conflicts:
	library/build.gradle
	library/repository/jp/kshoji/ble-midi/maven-metadata.xml
	library/repository/jp/kshoji/ble-midi/maven-metadata.xml.md5
	library/repository/jp/kshoji/ble-midi/maven-metadata.xml.sha1
diff --git a/library/build.gradle b/library/build.gradle
@@ -42,7 +42,7 @@ group = 'jp.kshoji'
 uploadArchives {
     repositories.mavenDeployer {
         repository url: 'file://' + file('repository').absolutePath
-        pom.version = '0.0.7'
+        pom.version = '0.0.8'
         pom.artifactId = 'ble-midi'
     }
 }
diff --git a/library/repository/jp/kshoji/ble-midi/0.0.8/ble-midi-0.0.8.aar b/library/repository/jp/kshoji/ble-midi/0.0.8/ble-midi-0.0.8.aar
diff --git a/library/repository/jp/kshoji/ble-midi/0.0.8/ble-midi-0.0.8.aar.md5 b/library/repository/jp/kshoji/ble-midi/0.0.8/ble-midi-0.0.8.aar.md5
@@ -0,0 +1 @@
+048aa6a9f4a15b9db0a4575aba633cf5
diff --git a/library/repository/jp/kshoji/ble-midi/0.0.8/ble-midi-0.0.8.aar.sha1 b/library/repository/jp/kshoji/ble-midi/0.0.8/ble-midi-0.0.8.aar.sha1
@@ -0,0 +1 @@
+6d2eed4880ae4600d9f610851132fc05c0cd2203
diff --git a/library/repository/jp/kshoji/ble-midi/0.0.8/ble-midi-0.0.8.pom b/library/repository/jp/kshoji/ble-midi/0.0.8/ble-midi-0.0.8.pom
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>jp.kshoji</groupId>
+  <artifactId>ble-midi</artifactId>
+  <version>0.0.8</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>jp.kshoji</groupId>
+      <artifactId>javax-sound-midi</artifactId>
+      <version>0.0.2</version>
+      <type>aar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-annotations</artifactId>
+      <version>21.0.3</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/library/repository/jp/kshoji/ble-midi/0.0.8/ble-midi-0.0.8.pom.md5 b/library/repository/jp/kshoji/ble-midi/0.0.8/ble-midi-0.0.8.pom.md5
@@ -0,0 +1 @@
+d2d07ca790e6f470690454e028d640ff
diff --git a/library/repository/jp/kshoji/ble-midi/0.0.8/ble-midi-0.0.8.pom.sha1 b/library/repository/jp/kshoji/ble-midi/0.0.8/ble-midi-0.0.8.pom.sha1
@@ -0,0 +1 @@
+2f6c3bbd88badd8d3f4402d01c96c73fbbc57d79
diff --git a/library/repository/jp/kshoji/ble-midi/maven-metadata.xml b/library/repository/jp/kshoji/ble-midi/maven-metadata.xml
@@ -17,7 +17,8 @@
       <version>0.0.6-SNAPSHOT</version>
       <version>0.0.6</version>
       <version>0.0.7</version>
+      <version>0.0.8</version>
     </versions>
-    <lastUpdated>20150331030008</lastUpdated>
+    <lastUpdated>20150430030503</lastUpdated>
   </versioning>
 </metadata>
diff --git a/library/repository/jp/kshoji/ble-midi/maven-metadata.xml.md5 b/library/repository/jp/kshoji/ble-midi/maven-metadata.xml.md5
@@ -1 +1 @@
-04d16e77c877fa8e88460604ba735e40
+026f2e59aa250d3ab9a576185506d04c
diff --git a/library/repository/jp/kshoji/ble-midi/maven-metadata.xml.sha1 b/library/repository/jp/kshoji/ble-midi/maven-metadata.xml.sha1
@@ -1 +1 @@
-4231f69f67134ee0ecf6411f76f79fc284fc373c
+243689f724241aba812ecf9ca614adfe6d78f71c
diff --git a/library/src/main/java/jp/kshoji/blemidi/central/BleMidiCallback.java b/library/src/main/java/jp/kshoji/blemidi/central/BleMidiCallback.java
@@ -282,6 +282,8 @@ private void disconnectByDeviceAddress(@NonNull String deviceAddress) {
         synchronized (midiInputDevicesMap) {
             Set<MidiInputDevice> midiInputDevices = midiInputDevicesMap.get(deviceAddress);
             if (midiInputDevices != null) {
+                midiInputDevicesMap.remove(deviceAddress);
+
                 for (MidiInputDevice midiInputDevice : midiInputDevices) {
                     midiInputDevice.setOnMidiInputEventListener(null);
 
@@ -291,20 +293,20 @@ private void disconnectByDeviceAddress(@NonNull String deviceAddress) {
 
                 }
                 midiInputDevices.clear();
-                midiInputDevicesMap.remove(deviceAddress);
             }
         }
 
         synchronized (midiOutputDevicesMap) {
             Set<MidiOutputDevice> midiOutputDevices = midiOutputDevicesMap.get(deviceAddress);
             if (midiOutputDevices != null) {
+                midiOutputDevicesMap.remove(deviceAddress);
+
                 for (MidiOutputDevice midiOutputDevice : midiOutputDevices) {
                     if (midiDeviceDetachedListener != null) {
                         midiDeviceDetachedListener.onMidiOutputDeviceDetached(midiOutputDevice);
                     }
                 }
                 midiOutputDevices.clear();
-                midiOutputDevicesMap.remove(deviceAddress);
             }
         }
     }
diff --git a/library/src/main/java/jp/kshoji/blemidi/peripheral/BleMidiPeripheralProvider.java b/library/src/main/java/jp/kshoji/blemidi/peripheral/BleMidiPeripheralProvider.java
@@ -262,23 +262,25 @@ private void disconnectByDeviceAddress(@NonNull String deviceAddress) {
         synchronized (midiInputDevicesMap) {
             MidiInputDevice midiInputDevice = midiInputDevicesMap.get(deviceAddress);
             if (midiInputDevice != null) {
+                midiInputDevicesMap.remove(deviceAddress);
+
                 midiInputDevice.setOnMidiInputEventListener(null);
 
                 if (midiDeviceDetachedListener != null) {
                     midiDeviceDetachedListener.onMidiInputDeviceDetached(midiInputDevice);
                 }
             }
-            midiInputDevicesMap.remove(deviceAddress);
         }
 
         synchronized (midiOutputDevicesMap) {
             MidiOutputDevice midiOutputDevice = midiOutputDevicesMap.get(deviceAddress);
             if (midiOutputDevice != null) {
+                midiOutputDevicesMap.remove(deviceAddress);
+
                 if (midiDeviceDetachedListener != null) {
                     midiDeviceDetachedListener.onMidiOutputDeviceDetached(midiOutputDevice);
                 }
             }
-            midiOutputDevicesMap.remove(deviceAddress);
         }
     }
 
@@ -359,30 +361,33 @@ public void onReceive(Context context, Intent intent) {
                     break;
 
                 case BluetoothProfile.STATE_DISCONNECTED:
-                    if (midiDeviceAttachedListener != null) {
+                    String deviceAddress = device.getAddress();
 
-                        String deviceAddress = device.getAddress();
+                    synchronized (midiInputDevicesMap) {
+                        MidiInputDevice midiInputDevice = midiInputDevicesMap.get(deviceAddress);
+                        if (midiInputDevice != null) {
+                            midiInputDevicesMap.remove(deviceAddress);
 
-                        synchronized (midiInputDevicesMap) {
-                            MidiInputDevice midiInputDevice = midiInputDevicesMap.get(deviceAddress);
-                            if (midiInputDevice != null) {
-                                midiInputDevice.setOnMidiInputEventListener(null);
+                            midiInputDevice.setOnMidiInputEventListener(null);
+                            if (midiDeviceDetachedListener != null) {
                                 midiDeviceDetachedListener.onMidiInputDeviceDetached(midiInputDevice);
-                                midiInputDevicesMap.remove(deviceAddress);
                             }
                         }
+                    }
 
-                        synchronized (midiOutputDevicesMap) {
-                            MidiOutputDevice midiOutputDevice = midiOutputDevicesMap.get(deviceAddress);
-                            if (midiOutputDevice != null) {
+                    synchronized (midiOutputDevicesMap) {
+                        MidiOutputDevice midiOutputDevice = midiOutputDevicesMap.get(deviceAddress);
+                        if (midiOutputDevice != null) {
+                            midiOutputDevicesMap.remove(deviceAddress);
+
+                            if (midiDeviceDetachedListener != null) {
                                 midiDeviceDetachedListener.onMidiOutputDeviceDetached(midiOutputDevice);
-                                midiOutputDevicesMap.remove(deviceAddress);
                             }
                         }
+                    }
 
-                        synchronized (bluetoothDevicesMap) {
-                            bluetoothDevicesMap.remove(deviceAddress);
-                        }
+                    synchronized (bluetoothDevicesMap) {
+                        bluetoothDevicesMap.remove(deviceAddress);
                     }
                     break;
             }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ group = 'jp.kshoji'`
`42`	`42`	`uploadArchives {`
`43`	`43`	`repositories.mavenDeployer {`
`44`	`44`	`repository url: 'file://' + file('repository').absolutePath`
`45`		`- pom.version = '0.0.7'`
	`45`	`+ pom.version = '0.0.8'`
`46`	`46`	`pom.artifactId = 'ble-midi'`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+6d2eed4880ae4600d9f610851132fc05c0cd2203`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+2f6c3bbd88badd8d3f4402d01c96c73fbbc57d79`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-04d16e77c877fa8e88460604ba735e40`
	`1`	`+026f2e59aa250d3ab9a576185506d04c`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-4231f69f67134ee0ecf6411f76f79fc284fc373c`
	`1`	`+243689f724241aba812ecf9ca614adfe6d78f71c`
Original file line number	Diff line number	Diff line change
`@@ -282,6 +282,8 @@ private void disconnectByDeviceAddress(@NonNull String deviceAddress) {`
`282`	`282`	`synchronized (midiInputDevicesMap) {`
`283`	`283`	`Set<MidiInputDevice> midiInputDevices = midiInputDevicesMap.get(deviceAddress);`
`284`	`284`	`if (midiInputDevices != null) {`
	`285`	`+ midiInputDevicesMap.remove(deviceAddress);`
	`286`	`+`
`285`	`287`	`for (MidiInputDevice midiInputDevice : midiInputDevices) {`
`286`	`288`	`midiInputDevice.setOnMidiInputEventListener(null);`
`287`	`289`
`@@ -291,20 +293,20 @@ private void disconnectByDeviceAddress(@NonNull String deviceAddress) {`
`291`	`293`
`292`	`294`	`}`
`293`	`295`	`midiInputDevices.clear();`
`294`		`- midiInputDevicesMap.remove(deviceAddress);`
`295`	`296`	`}`
`296`	`297`	`}`
`297`	`298`
`298`	`299`	`synchronized (midiOutputDevicesMap) {`
`299`	`300`	`Set<MidiOutputDevice> midiOutputDevices = midiOutputDevicesMap.get(deviceAddress);`
`300`	`301`	`if (midiOutputDevices != null) {`
	`302`	`+ midiOutputDevicesMap.remove(deviceAddress);`
	`303`	`+`
`301`	`304`	`for (MidiOutputDevice midiOutputDevice : midiOutputDevices) {`
`302`	`305`	`if (midiDeviceDetachedListener != null) {`
`303`	`306`	`midiDeviceDetachedListener.onMidiOutputDeviceDetached(midiOutputDevice);`
`304`	`307`	`}`
`305`	`308`	`}`
`306`	`309`	`midiOutputDevices.clear();`
`307`		`- midiOutputDevicesMap.remove(deviceAddress);`
`308`	`310`	`}`
`309`	`311`	`}`
`310`	`312`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,23 +262,25 @@ private void disconnectByDeviceAddress(@NonNull String deviceAddress) {`
`262`	`262`	`synchronized (midiInputDevicesMap) {`
`263`	`263`	`MidiInputDevice midiInputDevice = midiInputDevicesMap.get(deviceAddress);`
`264`	`264`	`if (midiInputDevice != null) {`
	`265`	`+ midiInputDevicesMap.remove(deviceAddress);`
	`266`	`+`
`265`	`267`	`midiInputDevice.setOnMidiInputEventListener(null);`
`266`	`268`
`267`	`269`	`if (midiDeviceDetachedListener != null) {`
`268`	`270`	`midiDeviceDetachedListener.onMidiInputDeviceDetached(midiInputDevice);`
`269`	`271`	`}`
`270`	`272`	`}`
`271`		`- midiInputDevicesMap.remove(deviceAddress);`
`272`	`273`	`}`
`273`	`274`
`274`	`275`	`synchronized (midiOutputDevicesMap) {`
`275`	`276`	`MidiOutputDevice midiOutputDevice = midiOutputDevicesMap.get(deviceAddress);`
`276`	`277`	`if (midiOutputDevice != null) {`
	`278`	`+ midiOutputDevicesMap.remove(deviceAddress);`
	`279`	`+`
`277`	`280`	`if (midiDeviceDetachedListener != null) {`
`278`	`281`	`midiDeviceDetachedListener.onMidiOutputDeviceDetached(midiOutputDevice);`
`279`	`282`	`}`
`280`	`283`	`}`
`281`		`- midiOutputDevicesMap.remove(deviceAddress);`
`282`	`284`	`}`
`283`	`285`	`}`
`284`	`286`
`@@ -359,30 +361,33 @@ public void onReceive(Context context, Intent intent) {`
`359`	`361`	`break;`
`360`	`362`
`361`	`363`	`case BluetoothProfile.STATE_DISCONNECTED:`
`362`		`- if (midiDeviceAttachedListener != null) {`
	`364`	`+ String deviceAddress = device.getAddress();`
`363`	`365`
`364`		`- String deviceAddress = device.getAddress();`
	`366`	`+ synchronized (midiInputDevicesMap) {`
	`367`	`+ MidiInputDevice midiInputDevice = midiInputDevicesMap.get(deviceAddress);`
	`368`	`+ if (midiInputDevice != null) {`
	`369`	`+ midiInputDevicesMap.remove(deviceAddress);`
`365`	`370`
`366`		`- synchronized (midiInputDevicesMap) {`
`367`		`- MidiInputDevice midiInputDevice = midiInputDevicesMap.get(deviceAddress);`
`368`		`- if (midiInputDevice != null) {`
`369`		`- midiInputDevice.setOnMidiInputEventListener(null);`
	`371`	`+ midiInputDevice.setOnMidiInputEventListener(null);`
	`372`	`+ if (midiDeviceDetachedListener != null) {`
`370`	`373`	`midiDeviceDetachedListener.onMidiInputDeviceDetached(midiInputDevice);`
`371`		`- midiInputDevicesMap.remove(deviceAddress);`
`372`	`374`	`}`
`373`	`375`	`}`
	`376`	`+ }`
`374`	`377`
`375`		`- synchronized (midiOutputDevicesMap) {`
`376`		`- MidiOutputDevice midiOutputDevice = midiOutputDevicesMap.get(deviceAddress);`
`377`		`- if (midiOutputDevice != null) {`
	`378`	`+ synchronized (midiOutputDevicesMap) {`
	`379`	`+ MidiOutputDevice midiOutputDevice = midiOutputDevicesMap.get(deviceAddress);`
	`380`	`+ if (midiOutputDevice != null) {`
	`381`	`+ midiOutputDevicesMap.remove(deviceAddress);`
	`382`	`+`
	`383`	`+ if (midiDeviceDetachedListener != null) {`
`378`	`384`	`midiDeviceDetachedListener.onMidiOutputDeviceDetached(midiOutputDevice);`
`379`		`- midiOutputDevicesMap.remove(deviceAddress);`
`380`	`385`	`}`
`381`	`386`	`}`
	`387`	`+ }`
`382`	`388`
`383`		`- synchronized (bluetoothDevicesMap) {`
`384`		`- bluetoothDevicesMap.remove(deviceAddress);`
`385`		`- }`
	`389`	`+ synchronized (bluetoothDevicesMap) {`
	`390`	`+ bluetoothDevicesMap.remove(deviceAddress);`
`386`	`391`	`}`
`387`	`392`	`break;`
`388`	`393`	`}`