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

Fix the valid length of a logged data 

Change-Id: I94abccd9585edc42555ab3ffaed35f09cdfadd44
main
satok 2010-05-21 14:00:37 +09:00
parent ed5d613e36
commit 107d9dd5c0
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,6 +141,9 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
} }
private void addCountEntry(long time) { private void addCountEntry(long time) {
if (sDBG) {
Log.d(TAG, "Log counts. (4)");
}
mLogBuffer.add(new LogEntry (time, ID_DELETE_COUNT, mLogBuffer.add(new LogEntry (time, ID_DELETE_COUNT,
new String[] {String.valueOf(mDeleteCount)})); new String[] {String.valueOf(mDeleteCount)}));
mLogBuffer.add(new LogEntry (time, ID_INPUT_COUNT, mLogBuffer.add(new LogEntry (time, ID_INPUT_COUNT,
@ -153,14 +156,21 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
mInputCount = 0; mInputCount = 0;
mWordCount = 0; mWordCount = 0;
mActualCharCount = 0; mActualCharCount = 0;
mLastTimeCountEntry = time;
} }
private void addThemeIdEntry(long time) { private void addThemeIdEntry(long time) {
if (sDBG) {
Log.d(TAG, "Log theme Id. (1)");
}
mLogBuffer.add(new LogEntry (time, ID_THEME_ID, mLogBuffer.add(new LogEntry (time, ID_THEME_ID,
new String[] {mThemeId})); new String[] {mThemeId}));
} }
private void flushPrivacyLogSafely() { private void flushPrivacyLogSafely() {
if (sDBG) {
Log.d(TAG, "Log theme Id. (" + mPrivacyLogBuffer.size() + ")");
}
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
Collections.sort(mPrivacyLogBuffer); Collections.sort(mPrivacyLogBuffer);
for (LogEntry l: mPrivacyLogBuffer) { for (LogEntry l: mPrivacyLogBuffer) {
@ -178,7 +188,7 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
private void addData(int tag, Object data) { private void addData(int tag, Object data) {
switch (tag) { switch (tag) {
case ID_DELETE_COUNT: case ID_DELETE_COUNT:
if (mLastTimeActive - mLastTimeCountEntry > MINIMUMCOUNTINTERVAL if (((mLastTimeActive - mLastTimeCountEntry) > MINIMUMCOUNTINTERVAL)
|| (mDeleteCount == 0 && mInputCount == 0)) { || (mDeleteCount == 0 && mInputCount == 0)) {
addCountEntry(mLastTimeActive); addCountEntry(mLastTimeActive);
addThemeIdEntry(mLastTimeActive); addThemeIdEntry(mLastTimeActive);
@ -186,7 +196,7 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
mDeleteCount += (Integer)data; mDeleteCount += (Integer)data;
break; break;
case ID_INPUT_COUNT: case ID_INPUT_COUNT:
if (mLastTimeActive - mLastTimeCountEntry > MINIMUMCOUNTINTERVAL if (((mLastTimeActive - mLastTimeCountEntry) > MINIMUMCOUNTINTERVAL)
|| (mDeleteCount == 0 && mInputCount == 0)) { || (mDeleteCount == 0 && mInputCount == 0)) {
addCountEntry(mLastTimeActive); addCountEntry(mLastTimeActive);
addThemeIdEntry(mLastTimeActive); addThemeIdEntry(mLastTimeActive);
@ -197,9 +207,9 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
case ID_AUTOSUGGESTION: case ID_AUTOSUGGESTION:
++mWordCount; ++mWordCount;
String[] dataStrings = (String[]) data; String[] dataStrings = (String[]) data;
if (dataStrings.length != 3) { if (dataStrings.length < 2) {
if (sDBG) { if (sDBG) {
Log.e(TAG, "The length of string array is invalid."); Log.e(TAG, "The length of logged string array is invalid.");
} }
break; break;
} }
@ -216,9 +226,9 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
case ID_AUTOSUGGESTIONCANCELED: case ID_AUTOSUGGESTIONCANCELED:
--mWordCount; --mWordCount;
dataStrings = (String[]) data; dataStrings = (String[]) data;
if (dataStrings.length != 3) { if (dataStrings.length < 2) {
if (sDBG) { if (sDBG) {
Log.e(TAG, "The length of string array is invalid."); Log.e(TAG, "The length of logged string array is invalid.");
} }
break; break;
} }
@ -241,6 +251,9 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
} }
private void commitInternal() { private void commitInternal() {
if (sDBG) {
Log.d(TAG, "Commit (" + mLogBuffer.size() + ")");
}
flushPrivacyLogSafely(); flushPrivacyLogSafely();
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
addCountEntry(now); addCountEntry(now);