hbina / capstoneandroidapp

Android application for ceg4912's capstone project

CapstoneAndroidApp

Multi-threaded Android application for ceg4912's Capstone Project. Navigable entirely through voice command.

capstoneandroidapp's Issues

unsolicited suggestion to simplify

@hbina @akiraro

Sorry for busting in with unsolicited suggestion but I was reading the code and saw the TODO comment to simplify the code. I figured I might be able to provide some general suggestions.

Change from

CapstoneAndroidApp/app/src/main/java/com/smartstick/ceg4912/capstoneandroidapp/services/RfidServices.java

Lines 36 to 80 in e7bf535

	@Override
	public void run() {
	super.run();
	// TODO: Rewrite this...make it a lot simpler than this...
	while (isRunning.get()) {
	try {
	if (BluetoothConnector.getInputStream() != null) {
	int availableBytes = BluetoothConnector.getInputStream().available();
	if (availableBytes > 0) {
	Log.d(TAG, String.format("Received something from Bluetooth of size:%d", availableBytes));
	byte[] rawBytes = new byte[availableBytes];
	final int receivedLength = BluetoothConnector.getInputStream().read(rawBytes);
	final String receivedString = filterBluetooth((new String(rawBytes, StandardCharsets.UTF_8)));
	if (receivedLength > 1) {
	Log.d(TAG, "receivedString:" + receivedString);
	currentLocation = receivedString;
	if (nodesInPath.isEmpty()) {
	SpeechServices.addText("Please enter a destination...");
	} else if (nodesInPath.size() == 1) {
	SpeechServices.addText("Congratulation, you have arrived at " + nodesInPath.poll());
	} else {
	if (currentLocation.equals(decodeNodeNameToId(nodesInPath.peekFirst()))) {
	SpeechServices.addText("You have arrived at " + encodeIdToName(receivedString));
	nodesInPath.removeFirst();
	} else {
	Log.d(TAG, String.format("currentLocation:%s peekFirst:%s", currentLocation, nodesInPath.peekFirst()));
	}
	BearingRequest bearingRequest = new BearingRequest(currentLocation, nodesInPath.peekFirst(), BearingListener.getBearing());
	RequestServices.addBearingRequest(bearingRequest);
	}
	} else {
	Log.d(TAG, "Delta string recevied => " + receivedString);
	}
	callerActivity.TEXT_VIEW_PATH.setText(nodesInPath.toString());
	}
	}
	} catch (
	IOException exception) {
	Log.e(TAG, exception.getMessage());
	}
	}
	Log.d(TAG, "Thread have finished running");
	}

To

@Override
public void run() {
    super.run();
    // TODO: Rewrite this...make it a lot simpler than this...
    while (isRunning.get()) {
        try {
            if (BluetoothConnector.getInputStream() == null) {
                continue;
            }
            
            int availableBytes = BluetoothConnector.getInputStream().available();

            if (availableBytes <= 0) {
                continue;
            }

            Log.d(TAG, String.format("Received something from Bluetooth of size:%d", availableBytes));
            byte[] rawBytes = new byte[availableBytes];
            final int receivedLength = BluetoothConnector.getInputStream().read(rawBytes);
            final String receivedString = filterBluetooth((new String(rawBytes, StandardCharsets.UTF_8)));

            if (receivedLength <= 1) {
                Log.d(TAG, "Delta string recevied => " + receivedString);
                continue;
            }

            Log.d(TAG, "receivedString:" + receivedString);
            currentLocation = receivedString;

            if (nodesInPath.isEmpty()) {
                SpeechServices.addText("Please enter a destination...");
                callerActivity.TEXT_VIEW_PATH.setText(nodesInPath.toString());
                continue;
            }
            
            if (nodesInPath.size() == 1) {
                SpeechServices.addText("Congratulation, you have arrived at " + nodesInPath.poll());
                callerActivity.TEXT_VIEW_PATH.setText(nodesInPath.toString());
                continue;
            }
            
            if (!currentLocation.equals(decodeNodeNameToId(nodesInPath.peekFirst()))) {
                Log.d(TAG, String.format("currentLocation:%s peekFirst:%s", currentLocation, nodesInPath.peekFirst()));
                continue;
            }
            
            SpeechServices.addText("You have arrived at " + encodeIdToName(receivedString));
            nodesInPath.removeFirst();
            BearingRequest bearingRequest = new BearingRequest(currentLocation, nodesInPath.peekFirst(), BearingListener.getBearing());
            RequestServices.addBearingRequest(bearingRequest);

            callerActivity.TEXT_VIEW_PATH.setText(nodesInPath.toString());

        } catch (
                IOException exception) {
            Log.e(TAG, exception.getMessage());
        }
    }
    Log.d(TAG, "Thread have finished running");
}

The logic is exactly the same but the idea here is to reorganize the main branch to as left as possible to avoid nested conditionals. Nested conditionals are generally more difficult to understand.

Hope this is useful.