ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix EAS debug switches and clean up debug prefs code.

This commit is contained in:
Andrew Stadler 2009-08-13 17:43:25 -07:00
parent b37b1b4bfe
commit 76a211e0d9
3 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/email/Email.java
View File

@ -203,7 +203,7 @@ public class Email extends Application {
public void onCreate() {
super.onCreate();
Preferences prefs = Preferences.getPreferences(this);
DEBUG = prefs.geteEnableDebugLogging();
DEBUG = prefs.getEnableDebugLogging();
DEBUG_SENSITIVE = prefs.getEnableSensitiveLogging();
// Reset all accounts to default visible window
@ -230,7 +230,7 @@ public class Email extends Application {
BinaryTempFileBody.setTempDirectory(getCacheDir());
// Enable logging in the EAS service, so it starts up as early as possible.
int debugLogging = prefs.geteEnableDebugLogging() ? Eas.DEBUG_BIT : 0;
int debugLogging = prefs.getEnableDebugLogging() ? Eas.DEBUG_BIT : 0;
int exchangeLogging = prefs.getEnableExchangeLogging() ? Eas.DEBUG_EXCHANGE_BIT : 0;
int fileLogging = prefs.getEnableExchangeFileLogging() ? Eas.DEBUG_FILE_BIT : 0;
int debugBits = debugLogging + exchangeLogging + fileLogging;

46
src/com/android/email/Preferences.java
View File

@ -22,12 +22,24 @@ import android.net.Uri;
import android.util.Log;
public class Preferences {
// Preferences file
private static final String PREFERENCES_FILE = "AndroidMail.Main";
// Preferences field names
private static final String ACCOUNT_UUIDS = "accountUuids";
private static final String DEFAULT_ACCOUNT_UUID = "defaultAccountUuid";
private static final String ENABLE_DEBUG_LOGGING = "enableDebugLogging";
private static final String ENABLE_SENSITIVE_LOGGING = "enableSensitiveLogging";
private static final String ENABLE_EXCHANGE_LOGGING = "enableExchangeLogging";
private static final String ENABLE_EXCHANGE_FILE_LOGGING = "enableExchangeFileLogging";
private static Preferences preferences;
SharedPreferences mSharedPreferences;
private Preferences(Context context) {
mSharedPreferences = context.getSharedPreferences("AndroidMail.Main", Context.MODE_PRIVATE);
mSharedPreferences = context.getSharedPreferences(PREFERENCES_FILE, Context.MODE_PRIVATE);
}
/**
@ -35,8 +47,6 @@ public class Preferences {
* Activity that initialized it. Do we lose ability to read Preferences in
* further Activities? Maybe this should be stored in the Application
* context.
*
* @return
*/
public static synchronized Preferences getPreferences(Context context) {
if (preferences == null) {
@ -48,11 +58,9 @@ public class Preferences {
/**
* Returns an array of the accounts on the system. If no accounts are
* registered the method returns an empty array.
*
* @return
*/
public Account[] getAccounts() {
String accountUuids = mSharedPreferences.getString("accountUuids", null);
String accountUuids = mSharedPreferences.getString(ACCOUNT_UUIDS, null);
if (accountUuids == null || accountUuids.length() == 0) {
return new Account[] {};
}
@ -76,7 +84,7 @@ public class Preferences {
if (uuid == null) {
return null;
}
String accountUuids = mSharedPreferences.getString("accountUuids", null);
String accountUuids = mSharedPreferences.getString(ACCOUNT_UUIDS, null);
if (accountUuids == null || accountUuids.length() == 0) {
return null;
}
@ -93,11 +101,9 @@ public class Preferences {
* Returns the Account marked as default. If no account is marked as default
* the first account in the list is marked as default and then returned. If
* there are no accounts on the system the method returns null.
*
* @return
*/
public Account getDefaultAccount() {
String defaultAccountUuid = mSharedPreferences.getString("defaultAccountUuid", null);
String defaultAccountUuid = mSharedPreferences.getString(DEFAULT_ACCOUNT_UUID, null);
Account defaultAccount = null;
Account[] accounts = getAccounts();
if (defaultAccountUuid != null) {
@ -120,39 +126,39 @@ public class Preferences {
}
public void setDefaultAccount(Account account) {
mSharedPreferences.edit().putString("defaultAccountUuid", account.getUuid()).commit();
mSharedPreferences.edit().putString(DEFAULT_ACCOUNT_UUID, account.getUuid()).commit();
}
public void setEnableDebugLogging(boolean value) {
mSharedPreferences.edit().putBoolean("enableDebugLogging", value).commit();
mSharedPreferences.edit().putBoolean(ENABLE_DEBUG_LOGGING, value).commit();
}
public boolean geteEnableDebugLogging() {
return mSharedPreferences.getBoolean("enableDebugLogging", false);
public boolean getEnableDebugLogging() {
return mSharedPreferences.getBoolean(ENABLE_DEBUG_LOGGING, false);
}
public void setEnableSensitiveLogging(boolean value) {
mSharedPreferences.edit().putBoolean("enableSensitiveLogging", value).commit();
mSharedPreferences.edit().putBoolean(ENABLE_SENSITIVE_LOGGING, value).commit();
}
public boolean getEnableSensitiveLogging() {
return mSharedPreferences.getBoolean("enableSensitiveLogging", false);
return mSharedPreferences.getBoolean(ENABLE_SENSITIVE_LOGGING, false);
}
public void setEnableExchangeLogging(boolean value) {
mSharedPreferences.edit().putBoolean("enableExchangeLogging", value).commit();
mSharedPreferences.edit().putBoolean(ENABLE_EXCHANGE_LOGGING, value).commit();
}
public boolean getEnableExchangeLogging() {
return mSharedPreferences.getBoolean("enableExchgangeLogging", false);
return mSharedPreferences.getBoolean(ENABLE_EXCHANGE_LOGGING, false);
}
public void setEnableExchangeFileLogging(boolean value) {
mSharedPreferences.edit().putBoolean("enableExchangeFileLogging", value).commit();
mSharedPreferences.edit().putBoolean(ENABLE_EXCHANGE_FILE_LOGGING, value).commit();
}
public boolean getEnableExchangeFileLogging() {
return mSharedPreferences.getBoolean("enableExchgangeFileLogging", false);
return mSharedPreferences.getBoolean(ENABLE_EXCHANGE_FILE_LOGGING, false);
}
public void save() {

54
src/com/android/email/activity/Debug.java
View File

@ -70,40 +70,32 @@ public class Debug extends Activity implements OnCheckedChangeListener {
}
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
int debugLogging = mPreferences.geteEnableDebugLogging() ? Eas.DEBUG_BIT : 0;
switch (buttonView.getId()) {
case R.id.debug_logging:
Email.DEBUG = isChecked;
mPreferences.setEnableDebugLogging(Email.DEBUG);
break;
case R.id.sensitive_logging:
Email.DEBUG_SENSITIVE = isChecked;
mPreferences.setEnableSensitiveLogging(Email.DEBUG_SENSITIVE);
break;
case R.id.exchange_logging:
mPreferences.setEnableExchangeLogging(isChecked);
break;
case R.id.exchange_file_logging:
mPreferences.setEnableExchangeFileLogging(isChecked);
if (!isChecked) {
FileLogger.close();
}
break;
}
// Now rebuild "debug bits" and send to EAS service
int debugLogging = mPreferences.getEnableDebugLogging() ? Eas.DEBUG_BIT : 0;
int exchangeLogging = mPreferences.getEnableExchangeLogging() ? Eas.DEBUG_EXCHANGE_BIT : 0;
int fileLogging = mPreferences.getEnableExchangeFileLogging() ? Eas.DEBUG_FILE_BIT : 0;
int debugBits = debugLogging + exchangeLogging + fileLogging;
int debugBits = debugLogging | exchangeLogging | fileLogging;
if (buttonView.getId() == R.id.debug_logging) {
Email.DEBUG = isChecked;
mPreferences.setEnableDebugLogging(Email.DEBUG);
if (isChecked) {
debugBits |= Eas.DEBUG_BIT;
} else {
debugBits &= ~Eas.DEBUG_BIT;
}
} else if (buttonView.getId() == R.id.sensitive_logging) {
Email.DEBUG_SENSITIVE = isChecked;
mPreferences.setEnableSensitiveLogging(Email.DEBUG_SENSITIVE);
} else if (buttonView.getId() == R.id.exchange_logging) {
mPreferences.setEnableExchangeLogging(isChecked);
if (isChecked) {
debugBits |= Eas.DEBUG_EXCHANGE_BIT;
} else {
debugBits &= ~Eas.DEBUG_EXCHANGE_BIT;
}
} else if (buttonView.getId() == R.id.exchange_file_logging) {
if (!isChecked) {
FileLogger.close();
}
mPreferences.setEnableExchangeFileLogging(isChecked);
if (isChecked) {
debugBits |= Eas.DEBUG_FILE_BIT;
} else {
debugBits &= ~Eas.DEBUG_FILE_BIT;
}
}
Controller.getInstance(getApplication()).serviceLogging(debugBits);
}