Skip to content

Commit

Permalink
bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Mehran7kl committed Feb 26, 2023
1 parent 639deb7 commit da7fb17
Show file tree
Hide file tree
Showing 116 changed files with 28 additions and 12 deletions.
14 changes: 11 additions & 3 deletions HttpServer/src/main/java/com/raisi/httpserver/HttpRequest.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.List;
import java.util.ArrayList;


public class HttpRequest extends HttpMessage
Expand Down Expand Up @@ -38,7 +38,15 @@ public HttpRequest(InputStream in)throws IOException
String line;
do{
line=din.readLine();

if(line==null){
try
{
Thread.sleep(100);
}
catch (InterruptedException e)
{}
continue;
}
if(!line.isEmpty()){
sb.append(line);
sb.append(System.lineSeparator());
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "com.raisi.hostserver"
minSdkVersion 14
targetSdkVersion 21
versionCode 1002000
versionName "1.2.0-beta"
versionCode 1002001
versionName "1.2.1-beta"
}
buildTypes {
release {
Expand Down
Binary file modified app/build/bin/classes.dex
Binary file not shown.
Binary file modified app/build/bin/classesdebug/adrt/ADRTMetadata.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/hostserver/R$attr.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/hostserver/R$drawable.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/hostserver/R$id.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/hostserver/R$layout.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/hostserver/R$raw.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/hostserver/R$string.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/hostserver/R$style.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/hostserver/R.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/hostserver/Statics.class
Binary file not shown.
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/hostserver/Utils.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/httpserver/R$attr.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/httpserver/R$drawable.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/httpserver/R$id.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/httpserver/R$layout.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/httpserver/R$raw.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/httpserver/R$string.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/httpserver/R$style.class
Binary file not shown.
Binary file modified app/build/bin/classesdebug/com/raisi/httpserver/R.class
Binary file not shown.
Binary file modified app/build/bin/classesrelease/adrt/ADRTLogCatReader.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/adrt/ADRTSender.dex
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/hostserver/MainActivity.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/hostserver/R$attr.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/hostserver/R$drawable.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/hostserver/R$id.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/hostserver/R$layout.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/hostserver/R$raw.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/hostserver/R$string.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/hostserver/R$style.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/hostserver/R.dex
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/hostserver/Statics.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/hostserver/Utils.dex
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/httpserver/R$attr.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/httpserver/R$drawable.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/httpserver/R$id.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/httpserver/R$layout.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/httpserver/R$raw.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/httpserver/R$string.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/httpserver/R$style.dex
Binary file not shown.
Binary file modified app/build/bin/classesrelease/com/raisi/httpserver/R.dex
Binary file not shown.
4 changes: 2 additions & 2 deletions app/build/bin/injected/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.raisi.hostserver"
android:versionCode="1002000"
android:versionName="1.2.0-beta">
android:versionCode="1002001"
android:versionName="1.2.1-beta">

<uses-sdk
android:minSdkVersion="14"
Expand Down
4 changes: 2 additions & 2 deletions app/build/bin/merged/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.raisi.hostserver"
android:versionCode="1002000"
android:versionName="1.2.0-beta" >
android:versionCode="1002001"
android:versionName="1.2.1-beta" >

<uses-sdk
android:minSdkVersion="14"
Expand Down
Binary file modified app/build/bin/resources.ap_
Binary file not shown.
14 changes: 11 additions & 3 deletions app/src/main/java/com/raisi/hostserver/reqnodes/FileNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ public int sendAsPartial(File f,OutputStream out)
if(isForDocument())
{
try{

out.write(message.getSourceBytes());
}catch(IOException e){
Log.err(e);
Expand All @@ -184,10 +185,16 @@ public int sendAsPartial(File f,OutputStream out)
Log.err(e);
return ERROR;
}
try{
//Client may refuse to download file; so this code sometimes throws exceptions that is usual.
InputStream in= Files.newInputStream( f.toPath());
readChunkWriteBuffer(writeOffset,writeLength,in,out);
try{
//Use optimized java method; Browser will close it at the end of the range.
if(offset<1){
Files.copy(f.toPath(),out);
}
else{
InputStream in= Files.newInputStream( f.toPath());
readChunkWriteBuffer(writeOffset,writeLength,in,out);
}
}catch(Exception e){
reportErrorOnSendingBody(e);
}
Expand All @@ -207,6 +214,7 @@ protected File getFilePath(HttpRequest req)

public static void readChunkWriteBuffer(int chunkOffset, int chunkLength, InputStream in,OutputStream out)throws IOException{
int fh=1024*64;//64KB

in.skip(chunkOffset);
byte[] b=new byte[fh];
while(chunkLength!=0){
Expand Down

0 comments on commit da7fb17

Please sign in to comment.