Skip to content

BugFix: Receiving does not appear to work #2 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schwitin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

BugFix: Receiving does not appear to work #2 #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions GodotBluetooth/android/src/GodotBluetooth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import android.util.Log;
import android.widget.Toast;
import android.content.Intent;
// import android.os.SystemClock;

import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -86,9 +87,10 @@ public void handleMessage(Message msg) {
if(msg.what == MESSAGE_READ){
String newData = (String) msg.obj;
receivedData.append(newData);
// Log.i(TAG, receivedData.toString());

int endElement = receivedData.indexOf("}");
if(endElement > 0) {
if(endElement >= 0) {
String completeData = receivedData.substring(0, endElement);
int dataSize = completeData.length();

Expand Down Expand Up @@ -340,19 +342,30 @@ public ConnectedThread(BluetoothSocket newSocket) {

public void run() {

byte[] buffer = new byte[1024];
int bytes;

while (true) {
try {
bytes = mmInStream.read(buffer);
String externalData = new String(buffer, 0, bytes);
localHandler.obtainMessage(MESSAGE_READ, bytes, -1, externalData).sendToTarget();
}

catch (IOException e) {
break;
}
// byte[] buffer = new byte[1024];
int bytes; // bytes returned from read()
int availableBytes = 0;

while (true) {
try {
availableBytes = mmInStream.available();
if(availableBytes > 0){
byte[] buffer = new byte[availableBytes]; // buffer store for the stream
// Read from the InputStream
//Log.d(TAG, "read");
bytes = mmInStream.read(buffer);

if( bytes > 0 ){
// Send the obtained bytes to the UI activity
String externalData = new String(buffer, 0, bytes);
localHandler.obtainMessage(MESSAGE_READ, bytes, -1, externalData).sendToTarget();
}
}
} catch (IOException e) {
Log.e("Error reading", e.getMessage());
e.printStackTrace();
break;
}
}
}

Expand Down