nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix logging issues"

main
satok 2010-06-07 18:40:57 -07:00 committed by Gerrit Code Review
parent 71a0e3f551 297444953c
commit 3a7adf6569
1 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
java/src/com/android/inputmethod/latin/LatinImeLogger.java
View File

@ -77,6 +77,7 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
/* package */ static String sLastAutoSuggestBefore; /* package */ static String sLastAutoSuggestBefore;
/* package */ static String sLastAutoSuggestAfter; /* package */ static String sLastAutoSuggestAfter;
/* package */ static String sLastAutoSuggestSeparator; /* package */ static String sLastAutoSuggestSeparator;
private static int sLastAutoSuggestDicTypeId;
private static HashMap<String, Integer> sSuggestDicMap = new HashMap<String, Integer>(); private static HashMap<String, Integer> sSuggestDicMap = new HashMap<String, Integer>();
private static DebugKeyEnabler sDebugKeyEnabler = new DebugKeyEnabler(); private static DebugKeyEnabler sDebugKeyEnabler = new DebugKeyEnabler();
@ -96,8 +97,7 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
private int mWordCount; private int mWordCount;
private int[] mAutoSuggestCountPerDic = new int[Suggest.DIC_TYPE_LAST_ID + 1]; private int[] mAutoSuggestCountPerDic = new int[Suggest.DIC_TYPE_LAST_ID + 1];
private int[] mManualSuggestCountPerDic = new int[Suggest.DIC_TYPE_LAST_ID + 1]; private int[] mManualSuggestCountPerDic = new int[Suggest.DIC_TYPE_LAST_ID + 1];
private int mAutoCancelledCount; private int[] mAutoCancelledCountPerDic = new int[Suggest.DIC_TYPE_LAST_ID + 1];
// ActualCharCount includes all characters that were completed.
private int mActualCharCount; private int mActualCharCount;
private static class LogEntry implements Comparable<LogEntry> { private static class LogEntry implements Comparable<LogEntry> {
@ -135,7 +135,7 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
mActualCharCount = 0; mActualCharCount = 0;
Arrays.fill(mAutoSuggestCountPerDic, 0); Arrays.fill(mAutoSuggestCountPerDic, 0);
Arrays.fill(mManualSuggestCountPerDic, 0); Arrays.fill(mManualSuggestCountPerDic, 0);
mAutoCancelledCount = 0; Arrays.fill(mAutoCancelledCountPerDic, 0);
mLogBuffer = new ArrayList<LogEntry>(); mLogBuffer = new ArrayList<LogEntry>();
mPrivacyLogBuffer = new ArrayList<LogEntry>(); mPrivacyLogBuffer = new ArrayList<LogEntry>();
mRingCharBuffer = new RingCharBuffer(context); mRingCharBuffer = new RingCharBuffer(context);
@ -158,7 +158,7 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
mActualCharCount = 0; mActualCharCount = 0;
Arrays.fill(mAutoSuggestCountPerDic, 0); Arrays.fill(mAutoSuggestCountPerDic, 0);
Arrays.fill(mManualSuggestCountPerDic, 0); Arrays.fill(mManualSuggestCountPerDic, 0);
mAutoCancelledCount = 0; Arrays.fill(mAutoCancelledCountPerDic, 0);
mLogBuffer.clear(); mLogBuffer.clear();
mPrivacyLogBuffer.clear(); mPrivacyLogBuffer.clear();
mRingCharBuffer.reset(); mRingCharBuffer.reset();
@ -208,16 +208,21 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
} }
mLogBuffer.add(new LogEntry(time, ID_AUTOSUGGESTIONCOUNT, s)); mLogBuffer.add(new LogEntry(time, ID_AUTOSUGGESTIONCOUNT, s));
mLogBuffer.add(new LogEntry(time, ID_AUTOSUGGESTIONCANCELLEDCOUNT, s = new String[mAutoCancelledCountPerDic.length];
new String[] {String.valueOf(mAutoCancelledCount)})); for (int i = 0; i < s.length; ++i) {
s[i] = String.valueOf(mAutoCancelledCountPerDic[i]);
}
mLogBuffer.add(new LogEntry(time, ID_AUTOSUGGESTIONCANCELLEDCOUNT, s));
s = new String[mManualSuggestCountPerDic.length]; s = new String[mManualSuggestCountPerDic.length];
for (int i = 0; i < s.length; ++i) { for (int i = 0; i < s.length; ++i) {
s[i] = String.valueOf(mManualSuggestCountPerDic[i]); s[i] = String.valueOf(mManualSuggestCountPerDic[i]);
} }
mLogBuffer.add(new LogEntry(time, ID_MANUALSUGGESTIONCOUNT, s)); mLogBuffer.add(new LogEntry(time, ID_MANUALSUGGESTIONCOUNT, s));
Arrays.fill(mAutoSuggestCountPerDic, 0); Arrays.fill(mAutoSuggestCountPerDic, 0);
Arrays.fill(mManualSuggestCountPerDic, 0); Arrays.fill(mManualSuggestCountPerDic, 0);
mAutoCancelledCount = 0; Arrays.fill(mAutoCancelledCountPerDic, 0);
} }
private void addThemeIdEntry(long time) { private void addThemeIdEntry(long time) {
@ -454,16 +459,20 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
before, after, String.valueOf(position), ""}); before, after, String.valueOf(position), ""});
} else if (!sSuggestDicMap.containsKey(after)) { } else if (!sSuggestDicMap.containsKey(after)) {
if (sDBG) { if (sDBG) {
Log.e(TAG, "logOnManualSuggestion was cancelled: came from unknown source."); Log.e(TAG, "logOnManualSuggestion was cancelled: from unknown dic.");
} }
} else { } else {
int dicTypeId = sSuggestDicMap.get(after); int dicTypeId = sSuggestDicMap.get(after);
sLatinImeLogger.mManualSuggestCountPerDic[dicTypeId]++; sLatinImeLogger.mManualSuggestCountPerDic[dicTypeId]++;
if (dicTypeId != Suggest.DIC_MAIN) { if (dicTypeId != Suggest.DIC_MAIN) {
if (sDBG) { if (sDBG) {
Log.d(TAG, "logOnManualSuggestion was cancelled: didn't come from main dic."); Log.d(TAG, "logOnManualSuggestion was cancelled: not from main dic.");
} }
} else { before = "";
after = "";
}
// TODO: Don't send a log if this doesn't come from Main Dictionary.
{
if (before.equals(after)) { if (before.equals(after)) {
before = ""; before = "";
after = ""; after = "";
@ -487,37 +496,41 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
if (sLogEnabled) { if (sLogEnabled) {
if (!sSuggestDicMap.containsKey(after)) { if (!sSuggestDicMap.containsKey(after)) {
if (sDBG) { if (sDBG) {
Log.e(TAG, "logOnAutoSuggestion was cancelled: came from unknown source."); Log.e(TAG, "logOnAutoSuggestion was cancelled: from unknown dic.");
} }
return; } else {
} String separator = String.valueOf(sLatinImeLogger.mRingCharBuffer.getLastChar());
int dicId = sSuggestDicMap.get(after); sLastAutoSuggestDicTypeId = sSuggestDicMap.get(after);
sLatinImeLogger.mAutoSuggestCountPerDic[dicId]++; sLatinImeLogger.mAutoSuggestCountPerDic[sLastAutoSuggestDicTypeId]++;
sSuggestDicMap.clear(); if (sLastAutoSuggestDicTypeId != Suggest.DIC_MAIN) {
if (dicId != Suggest.DIC_MAIN) {
if (sDBG) { if (sDBG) {
Log.d(TAG, "logOnAutoSuggestion was cancelled: didn't come from main dic."); Log.d(TAG, "logOnAutoSuggestion was cancelled: not from main dic.");
} }
return; before = "";
after = "";
} }
// TODO: Not to send a log if this doesn't come from Main Dictionary.
{
if (before.equals(after)) { if (before.equals(after)) {
before = ""; before = "";
after = ""; after = "";
} }
sLastAutoSuggestSeparator = String[] strings = new String[] {before, after, separator};
String.valueOf(sLatinImeLogger.mRingCharBuffer.getLastChar()); sLatinImeLogger.sendLogToDropBox(ID_AUTOSUGGESTION, strings);
String[] strings = new String[] {before, after, sLastAutoSuggestSeparator}; }
synchronized (LatinImeLogger.class) { synchronized (LatinImeLogger.class) {
sLastAutoSuggestBefore = before; sLastAutoSuggestBefore = before;
sLastAutoSuggestAfter = after; sLastAutoSuggestAfter = after;
sLastAutoSuggestSeparator = separator;
} }
sLatinImeLogger.sendLogToDropBox(ID_AUTOSUGGESTION, strings); }
sSuggestDicMap.clear();
} }
} }
public static void logOnAutoSuggestionCanceled() { public static void logOnAutoSuggestionCanceled() {
if (sLogEnabled) { if (sLogEnabled) {
sLatinImeLogger.mAutoCancelledCount++; sLatinImeLogger.mAutoCancelledCountPerDic[sLastAutoSuggestDicTypeId]++;
if (sLastAutoSuggestBefore != null && sLastAutoSuggestAfter != null) { if (sLastAutoSuggestBefore != null && sLastAutoSuggestAfter != null) {
String[] strings = new String[] { String[] strings = new String[] {
sLastAutoSuggestBefore, sLastAutoSuggestAfter, sLastAutoSuggestSeparator}; sLastAutoSuggestBefore, sLastAutoSuggestAfter, sLastAutoSuggestSeparator};