Skip to content

Commit ecb3685

Browse files
authored
Merge pull request #133 from hakimdiallo/bug_#106_fixing
Invalid remote report in dialog box
2 parents 150a101 + ad196e1 commit ecb3685

2 files changed

Lines changed: 30 additions & 2 deletions

File tree

src/main/java/me/sheimi/android/utils/BasicFunctions.java

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
package me.sheimi.android.utils;
22

3+
import android.content.DialogInterface;
4+
import android.content.Intent;
5+
import android.util.Log;
6+
import android.widget.Toast;
7+
38
import java.security.MessageDigest;
49
import java.security.NoSuchAlgorithmException;
510
import java.util.Locale;
611

712
import me.sheimi.android.activities.SheimiFragmentActivity;
13+
import me.sheimi.sgit.R;
814

915
import com.nostra13.universalimageloader.core.ImageLoader;
1016

@@ -68,8 +74,27 @@ public static void showException(Throwable t) {
6874

6975
public static void showException(Throwable t, int res) {
7076
SheimiFragmentActivity activity = BasicFunctions.getActiveActivity();
71-
activity.showToastMessage(res);
72-
t.printStackTrace();
77+
StackTraceElement[] ste = t.getStackTrace();
78+
String str = t.getCause().getMessage()+"\n";
79+
for (int i=0; i < ste.length; i++){
80+
str += ste[i].toString()+"\n";
81+
}
82+
final String str2 = str;
83+
activity.showMessageDialog(R.string.dialog_show_invalid_remote, str2, R.string.action_send_report, new DialogInterface.OnClickListener() {
84+
@Override
85+
public void onClick(DialogInterface dialogInterface, int i) {
86+
Intent intent = new Intent(Intent.ACTION_SEND);
87+
intent.setType("message/rfc822");
88+
intent.putExtra(Intent.EXTRA_EMAIL , new String[]{getActiveActivity().getString(R.string.report_mail)});
89+
intent.putExtra(Intent.EXTRA_SUBJECT, getActiveActivity().getString(R.string.dialog_show_invalid_remote));
90+
intent.putExtra(Intent.EXTRA_TEXT, str2);
91+
try {
92+
getActiveActivity().startActivity(Intent.createChooser(intent, "Send mail..."));
93+
} catch (android.content.ActivityNotFoundException ex) {
94+
Toast.makeText(getActiveActivity(), "There are no email clients installed.", Toast.LENGTH_SHORT).show();
95+
}
96+
}
97+
});
7398
}
7499

75100
}

src/main/res/values/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<string name="default_text">Default Text</string>
66
<string name="title_clone_repo">Clone Repository</string>
77
<string name="preference_file_key" translatable="false">com.manichord.mgit</string>
8+
<string name="report_mail">mgit@manichord.com</string>
89

910
<!-- action -->
1011
<string name="action_search">Search</string>
@@ -31,6 +32,7 @@
3132
<string name="action_create_external_repo">Create External Repo</string>
3233
<string name="action_share_diff">Share diff</string>
3334
<string name="action_save_diff">Save diff</string>
35+
<string name="action_send_report">Send report</string>
3436

3537
<!-- label msg -->
3638
<string name="label_ok">OK</string>
@@ -117,6 +119,7 @@
117119
<string name="dialog_clone_recursive">Clone recursively</string>
118120
<string name="dialog_show_unstaged_diff">Unstaged diff</string>
119121
<string name="dialog_show_staged_diff">Staged diff</string>
122+
<string name="dialog_show_invalid_remote">Invalid remote report</string>
120123

121124

122125
<!-- Others -->

0 commit comments

Comments
 (0)