Merge "Fix ResearchLogger feedback bug"
This commit is contained in:
commit
eac0eb89f2
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);
|
mMainResearchLog.blockingClose(RESEARCHLOG_CLOSE_TIMEOUT_IN_MS);
|
||||||
|
|
||||||
resetLogBuffers();
|
resetLogBuffers();
|
||||||
|
cancelFeedbackDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void abort() {
|
public void abort() {
|
||||||
|
@ -701,13 +702,19 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
|
||||||
mInFeedbackDialog = false;
|
mInFeedbackDialog = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void cancelFeedbackDialog() {
|
||||||
|
if (isMakingUserRecording()) {
|
||||||
|
cancelRecording();
|
||||||
|
}
|
||||||
|
mInFeedbackDialog = false;
|
||||||
|
}
|
||||||
|
|
||||||
public void initSuggest(final Suggest suggest) {
|
public void initSuggest(final Suggest suggest) {
|
||||||
mSuggest = suggest;
|
mSuggest = suggest;
|
||||||
// MainLogBuffer now has an out-of-date Suggest object. Close down MainLogBuffer and create
|
// MainLogBuffer now has an out-of-date Suggest object. Close down MainLogBuffer and create
|
||||||
// a new one.
|
// a new one.
|
||||||
if (mMainLogBuffer != null) {
|
if (mMainLogBuffer != null) {
|
||||||
stop();
|
restart();
|
||||||
start();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue