Use nullity inferred CoolSocket base and bump version to 0.1.0-ALPHA30

Author: velitasali

pom.xml

@@ -22,7 +22,7 @@
 
     <groupId>org.monora.uprotocol</groupId>
     <artifactId>core</artifactId>
-    <version>0.1.0-ALPHA29</version>
+    <version>0.1.0-ALPHA30</version>
     <name>UProtocol</name>
     <description>Java implementation of uprotocol, an open specification for p2p content exchange</description>
     <licenses>
@@ -142,7 +142,7 @@
         <dependency>
             <groupId>org.monora.coolsocket</groupId>
             <artifactId>core</artifactId>
-            <version>2.0-rc13</version>
+            <version>2.0-rc15</version>
         </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
@@ -161,6 +161,7 @@
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
             <version>16.0.2</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <!--Some Android 4~ doesn't have Base64 built-in-->

src/main/java/org/monora/uprotocol/core/transfer/Transfers.java

@@ -3,7 +3,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.monora.coolsocket.core.response.SizeOverflowException;
 import org.monora.coolsocket.core.session.ActiveConnection;
 import org.monora.coolsocket.core.session.CancelledException;
 import org.monora.uprotocol.core.CommunicationBridge;
@@ -165,7 +164,7 @@ public static void receive(@NotNull CommunicationBridge bridge, @NotNull Transfe
     /**
      * Handle the sending process. You can invoke this method via {@link TransportSeat#beginFileTransfer} method when
      * the type is {@link TransferItem.Type#Outgoing}.
-     *
+     * <p>
      * This can also be invoked when using {@link CommunicationBridge#requestFileTransferStart}.
      *
      * @param bridge    The bridge that speaks on behalf of you when making requests. A connection wrapper.
@@ -218,20 +217,32 @@ public static void send(@NotNull CommunicationBridge bridge, @NotNull TransferOp
                             byte[] bytes = new byte[8096];
                             int len;
 
-                            try {
-                                while ((len = inputStream.read(bytes)) != -1) {
-                                    operation.publishProgress();
+                            // For avoiding Android MediaStore bug where the reported size is different than actual
+                            // data size.
+                            boolean exceedingClose = false;
+                            long available;
 
-                                    if (len > 0) {
-                                        operation.setBytesOngoing(operation.getBytesOngoing() + len, len);
-                                        activeConnection.write(description, bytes, 0, len);
+                            while ((len = inputStream.read(bytes)) != -1) {
+                                operation.publishProgress();
+
+                                if (len > 0) {
+                                    available = description.available();
+                                    if (len > available) {
+                                        len = (int) available;
+                                        exceedingClose = true;
                                     }
-                                }
 
-                                activeConnection.writeEnd(description);
-                            } catch (SizeOverflowException ignored) {
+                                    operation.setBytesOngoing(operation.getBytesOngoing() + len, len);
+                                    activeConnection.write(description, bytes, 0, len);
+
+                                    if (exceedingClose) {
+                                        break;
+                                    }
+                                }
                             }
 
+                            activeConnection.writeEnd(description);
+
                             operation.setBytesTotal(operation.getBytesTotal() + operation.getBytesOngoing());
                             operation.setCount(operation.getCount() + 1);
                             operation.clearBytesOngoing();