TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-16 05:11:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

migrate logcat submit to preferences

Browse Source 
// FREEBIE
This commit is contained in:
Jake McGinty 2014-02-25 23:11:00 -08:00
parent 15390e477e
commit 0015711759
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/menu/log_submit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:title="@string/text_secure_normal__submit_debug_log"
<item android:title="@string/preferences__submit_debug_log"
android:id="@+id/menu_submit_debug_logs"
android:icon="@android:drawable/ic_menu_upload" />
</menu>

3
res/values/strings.xml
View File

@ -713,6 +713,8 @@
<string name="preferences__allow_sms_fallback_disabled_reason">TextSecure is currently your default SMS app. Please set another default SMS app first to change this preference.</string>
<string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Send and receive SMS messages when push is not available</string>
<string name="preferences__refresh_push_directory">Refresh Push Directory</string>
<string name="preferences__submit_debug_log">Submit debug log</string>
<!-- **************************************** -->
<!-- menus -->
@ -783,7 +785,6 @@
<string name="text_secure_normal__menu_settings">Settings</string>
<string name="text_secure_normal__menu_clear_passphrase">Lock</string>
<string name="text_secure_normal__mark_all_as_read">Mark All Read</string>
<string name="text_secure_normal__submit_debug_log">Submit debug log</string>
<!-- verify_keys -->
<string name="verify_keys__menu_verified">Verified</string>

3
res/xml/preferences.xml
View File

@ -177,5 +177,8 @@
<Preference android:key="pref_update_directory"
android:title="@string/preferences__refresh_push_directory"/>
<Preference android:key="pref_submit_debug_logs"
android:title="@string/preferences__submit_debug_log"/>
</PreferenceCategory>
</PreferenceScreen>

12
src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
View File

@ -84,6 +84,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
private static final String MMS_PREF = "pref_mms_preferences";
private static final String KITKAT_DEFAULT_PREF = "pref_set_default";
private static final String UPDATE_DIRECTORY_PREF = "pref_update_directory";
private static final String SUBMIT_DEBUG_LOG_PREF = "pref_submit_debug_logs";
private final DynamicTheme dynamicTheme = new DynamicTheme();
private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
@ -122,6 +123,8 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
.setOnPreferenceChangeListener(new RingtoneSummaryListener());
this.findPreference(UPDATE_DIRECTORY_PREF)
.setOnPreferenceClickListener(new DirectoryUpdateListener());
this.findPreference(SUBMIT_DEBUG_LOG_PREF)
.setOnPreferenceClickListener(new SubmitDebugLogListener());
initializeListSummary((ListPreference) findPreference(TextSecurePreferences.LED_COLOR_PREF));
initializeListSummary((ListPreference) findPreference(TextSecurePreferences.LED_BLINK_PREF));
@ -576,6 +579,15 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
}
}
private class SubmitDebugLogListener implements Preference.OnPreferenceClickListener {
@Override
public boolean onPreferenceClick(Preference preference) {
final Intent intent = new Intent(ApplicationPreferencesActivity.this, LogSubmitActivity.class);
startActivity(intent);
return true;
}
}
/* http://code.google.com/p/android/issues/detail?id=4611#c35 */
@SuppressWarnings("deprecation")
@Override

7
src/org/thoughtcrime/securesms/ConversationListActivity.java
View File

@ -109,7 +109,6 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
menu.clear();
inflater.inflate(R.menu.text_secure_normal, menu);
inflater.inflate(R.menu.log_submit, menu);
menu.findItem(R.id.menu_clear_passphrase).setVisible(!TextSecurePreferences.isPasswordDisabled(this));
@ -153,7 +152,6 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
case R.id.menu_settings: handleDisplaySettings(); return true;
case R.id.menu_clear_passphrase: handleClearPassphrase(); return true;
case R.id.menu_mark_all_read: handleMarkAllRead(); return true;
case R.id.menu_submit_debug_logs: handleLogSubmit(); return true;
case android.R.id.home: handleNavigationDrawerToggle(); return true;
}
@ -187,11 +185,6 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
startActivity(intent);
}
private void handleLogSubmit() {
Intent intent = new Intent(this, LogSubmitActivity.class);
startActivity(intent);
}
private void handleNavigationDrawerToggle() {
if (drawerLayout.isDrawerOpen(drawerList)) {
drawerLayout.closeDrawer(drawerList);