Skip to content
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

avoid suggesting the user to update the recommended fw if already there #8495

Merged
merged 1 commit into from
Mar 7, 2021
Merged

avoid suggesting the user to update the recommended fw if already there #8495

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
10 changes: 9 additions & 1 deletion ...s/android/tools/camera/src/main/java/com/intel/realsense/camera/FirmwareUpdateDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,16 @@ public class FirmwareUpdateDialog extends DialogFragment {
private TextView mTitle;

private boolean mDontShowAgain = false;
private boolean mAlreadyLatestInstalled = false;

static private String getFirmwareUpdateMessage(Device device){
private String getFirmwareUpdateMessage(Device device){
final String recFw = device.supportsInfo(CameraInfo.RECOMMENDED_FIRMWARE_VERSION) ?
device.getInfo(CameraInfo.RECOMMENDED_FIRMWARE_VERSION) : "unknown";
final String fw = device.getInfo(CameraInfo.FIRMWARE_VERSION);
if (recFw.equals(fw)){
mAlreadyLatestInstalled = true;
return "The recommended firmware is already installed";
}
return "The firmware of the connected device is: " + fw +
"\n\nThe recommended firmware for this device is: " + recFw;
}
Expand Down Expand Up @@ -93,6 +98,9 @@ public void onClick(View view) {
}
});

if (mAlreadyLatestInstalled)
ev-mp marked this conversation as resolved.
Show resolved Hide resolved
mFwUpdateButton.setEnabled(false);

mSkipFwUpdateButton = fragmentView.findViewById(R.id.skipFwUpdateButton);
mSkipFwUpdateButton.setOnClickListener(new View.OnClickListener() {
@Override
Expand Down