Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Commit

Permalink
Merge pull request #77 from g-ortuno/loading-screen
Browse files Browse the repository at this point in the history
Fixed loading screen
  • Loading branch information
schilit committed Dec 3, 2014
2 parents 6cfb5fd + 9db4988 commit 79deba0
Showing 1 changed file with 3 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ public void onCancel(DialogInterface dialog) {
finish();
}
});
mConnectionDialog.show();
}
List<ParcelUuid> uuids = scanResult.getScanRecord().getServiceUuids();
// Assuming the first uuid is the config uuid
Expand Down Expand Up @@ -254,6 +255,7 @@ private void updateInputFields(ConfigUriBeacon configUriBeacon) {
else if (mUriBeaconConfig.getVersion().equals(ProtocolV1.CONFIG_SERVICE_UUID)) {
hideV2Fields();
}
mConnectionDialog.dismiss();
}
else {
Toast.makeText(this, "Beacon Contains Invalid Data", Toast.LENGTH_SHORT).show();
Expand All @@ -266,6 +268,7 @@ private String byteToHexString(byte theByte) {
private byte hexStringToByte(String hexString) {
return Integer.decode("0x" + hexString).byteValue();
}

private void hideV2Fields(){
findViewById(R.id.secondRow).setVisibility(View.GONE);
findViewById(R.id.txCalRow).setVisibility(View.GONE);
Expand Down

0 comments on commit 79deba0

Please sign in to comment.