am eac0eb89
: Merge "Fix ResearchLogger feedback bug"
* commit 'eac0eb89f23a9962ece6eb884ce41610e0b85ea0': Fix ResearchLogger feedback bug
This commit is contained in:
commit
3cdea37c6d
1 changed files with 9 additions and 2 deletions
|
@ -429,6 +429,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
|
|||
mMainResearchLog.blockingClose(RESEARCHLOG_CLOSE_TIMEOUT_IN_MS);
|
||||
|
||||
resetLogBuffers();
|
||||
cancelFeedbackDialog();
|
||||
}
|
||||
|
||||
public void abort() {
|
||||
|
@ -701,13 +702,19 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
|
|||
mInFeedbackDialog = false;
|
||||
}
|
||||
|
||||
private void cancelFeedbackDialog() {
|
||||
if (isMakingUserRecording()) {
|
||||
cancelRecording();
|
||||
}
|
||||
mInFeedbackDialog = false;
|
||||
}
|
||||
|
||||
public void initSuggest(final Suggest suggest) {
|
||||
mSuggest = suggest;
|
||||
// MainLogBuffer now has an out-of-date Suggest object. Close down MainLogBuffer and create
|
||||
// a new one.
|
||||
if (mMainLogBuffer != null) {
|
||||
stop();
|
||||
start();
|
||||
restart();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue