Fixes CCZ Install during Recovery #2086
Conversation
| if (resultCode == Activity.RESULT_OK) { | ||
| mPresenter.doOfflineAppInstall(intent.getStringExtra(InstallArchiveActivity.ARCHIVE_JR_REFERENCE)); | ||
| } else { | ||
| mPresenter.OnOfflineInstallCancelled(); |
There was a problem hiding this comment.
Happens when user returns to the Recovery Screen without selecting any file.
| Logger.log(LogTypes.TYPE_MAINTENANCE, String.format( | ||
| "%s failed with %s for recovery measure %s", mCurrentMeasure.getType(), reason, mCurrentMeasure.getSequenceNumber())); | ||
| if (mActivity != null) { | ||
| Logger.log(LogTypes.TYPE_MAINTENANCE, String.format( |
There was a problem hiding this comment.
This is to fix the NPE linked in PR description. I am not sure how mCurrentMeasure is getting null though I am hoping it's because actvity is no longer alive and hence hoping moving the log under activity not null check might fix it.
There was a problem hiding this comment.
Just double chekcing, you mean how "mActivity is getting through null", right? not mCurrentMeasure? Or is mCurrentMeasure coming through null when mActivity is null?
There was a problem hiding this comment.
we are getting a crash report because of mCurrentMeasure being null. Though I have not been able to repro it on my end.
There was a problem hiding this comment.
I have now reverted this change and wrapped the whole thing inside a try catch block to not crash the app in case of any errors here but log the exception and show user a failure message.
shubham1g5
changed the title
| if (mLastExecutionStatus == STATUS_FAILED) { | ||
| mActivity.enableRetry(); | ||
| updateStatus(mLastDisplayStatus); | ||
| } else if (!(connectToUpdateTask() || mActivity.aTaskInProgress()) && mLastExecutionStatus != STATUS_WAITING) { |
There was a problem hiding this comment.
Removed mLastExecutionStatus != STATUS_WAITING condition here since in case we don't have an exisiting task to connect to and mLastExecutionStatus is STATUS_WAITING means that we have lost result of the last async task. So the only resonable thing to do in this case is to trigger the measures again.
| } else { | ||
| return STATUS_EXECUTED; | ||
| } | ||
| } catch (Exception e) { |
There was a problem hiding this comment.
This is only change in L140 - L190. Moved this exception handling to the top level function start
Does 5 things-
Corrects the dispatch to offline install activity (Jira). This was a silly mistake on my part and was affecting APP_REINSTALL_AND_UPDATE measure which allows user to choose between offline and online install.
Handles the case when user returns to the Recovery Screen without selecting any file.
Tries to handle the NPE. I have not been able to repro it so unsure why it's happening.
Error handling: Catch any exceptions in async calls , Logs complete stack trace for an exception during install.
In case we lost result of last recovery call and there is no task currently in progress, trigger the measures again.
Fixes another silly mistake where update was not getting called for offline_reinstall_and_update_measure.