Skip to content

Commit

Permalink
activity to submit logcat to pastebin
Browse files Browse the repository at this point in the history
  • Loading branch information
mcginty committed Feb 26, 2014
1 parent 7987362 commit ce68429
Show file tree
Hide file tree
Showing 7 changed files with 389 additions and 7 deletions.
5 changes: 5 additions & 0 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@
<activity android:name=".RegistrationProgressActivity"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

<activity android:name=".LogSubmitActivity"
android:label="@string/AndroidManifest__log_submit"
android:windowSoftInputMode="stateHidden"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

<service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
<service android:enabled="true" android:name=".service.KeyCachingService"/>
<service android:enabled="true" android:name=".service.SendReceiveService"/>
Expand Down
51 changes: 51 additions & 0 deletions res/layout/log_submit_activity.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">

<TextView android:id="@+id/log_submit_confirmation"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
android:textStyle="bold"
android:text="@string/log_submit_activity__confirmation"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingTop="10dp"
android:paddingBottom="10dp" />

<ScrollView android:id="@+id/log_preview_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="2">
<EditText android:id="@+id/log_preview"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="?android:attr/textViewStyle"
android:padding="10dp"
android:background="@null"
android:fontFamily="monospace"
android:hint=""
android:inputType="textImeMultiLine|textNoSuggestions|textMultiLine"
android:textSize="10sp" />
</ScrollView>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button android:id="@+id/cancel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/log_submit_activity__button_cancel"
android:layout_weight="1"/>
<Button android:id="@+id/ok"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/log_submit_activity__button_ok"
android:layout_weight="1"/>
</LinearLayout>

</LinearLayout>
7 changes: 7 additions & 0 deletions res/menu/log_submit.xml
Original file line number Diff line number Diff line change
@@ -0,0 +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"
android:id="@+id/menu_submit_debug_logs"
android:icon="@android:drawable/ic_menu_upload" />
</menu>
16 changes: 15 additions & 1 deletion res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,19 @@
<string name="create_passphrase_activity__repeat">REPEAT:</string>
<string name="create_passphrase_activity__continue">Continue</string>
<string name="create_passphrase_activity__generating_secrets">GENERATING SECRETS</string>


<!-- log_submit_activity -->
<string name="log_submit_activity__confirmation">This log will be posted publicly online for TextSecure contributors to view. Feel free to examine or edit the logs below before hitting submit.</string>
<string name="log_submit_activity__button_cancel">Don\'t submit</string>
<string name="log_submit_activity__button_ok">Submit</string>
<string name="log_submit_activity__log_fetch_failed">Could not grab logs from your device. You can still use ADB to get debug logs instead.</string>
<string name="log_submit_activity__log_submit_success_title">Success!</string>
<string name="log_submit_activity__log_got_it">Got it</string>
<string name="log_submit_activity__your_pastebin_url">Please copy this URL and add it to your issue (long press to put in clipboard):\n\n<b>%1$s</b></string>
<string name="log_submit_activity__copied_to_clipboard">Copied to clipboard</string>
<string name="log_submit_activity__loading_logcat">Loading logcat&#8230;</string>
<string name="log_submit_activity__thanks">Thanks for your help!</string>

<!-- database_migration_activity -->
<string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Would you like to import your existing text messages into TextSecure\'s encrypted database?</string>
<string name="database_migration_activity__the_default_system_database_will_not_be_modified">The default system database will not be modified or altered in any way.</string>
Expand Down Expand Up @@ -608,6 +620,7 @@
<string name="AndroidManifest__verify_identity">Verify Identity</string>
<string name="AndroidManifest__manage_identity_keys">Manage Identity Keys</string>
<string name="AndroidManifest__complete_key_exchange">Complete Key Exchange</string>
<string name="AndroidManifest__log_submit">Submit Debug Logs</string>

<!-- arrays.xml -->
<string name="arrays__import_export">Import / Export</string>
Expand Down Expand Up @@ -770,6 +783,7 @@
<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>
Expand Down
19 changes: 13 additions & 6 deletions src/org/thoughtcrime/securesms/ConversationListActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
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));

Expand Down Expand Up @@ -147,12 +148,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
int defaultType = ThreadDatabase.DistributionTypes.DEFAULT;

switch (item.getItemId()) {
case R.id.menu_new_message: openSingleContactSelection(); return true;
case R.id.menu_new_group: createGroup(); return true;
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 android.R.id.home: handleNavigationDrawerToggle(); return true;
case R.id.menu_new_message: openSingleContactSelection(); return true;
case R.id.menu_new_group: createGroup(); return true;
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;
}

return false;
Expand Down Expand Up @@ -185,6 +187,11 @@ private void createConversation(long threadId, Recipients recipients, int distri
startActivity(intent);
}

private void handleLogSubmit() {
Intent intent = new Intent(this, LogSubmitActivity.class);
startActivity(intent);
}

private void handleNavigationDrawerToggle() {
if (drawerLayout.isDrawerOpen(drawerList)) {
drawerLayout.closeDrawer(drawerList);
Expand Down

1 comment on commit ce68429

@WhisperBTC
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! BitHub has sent payment of $93.65USD for this commit.

Please sign in to comment.