narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

changed behaviour of expecption handler to check if accounts are working before removing the stacktrace

Browse source
This commit is contained in:
Daniel Gultsch 2014-04-10 13:19:58 +02:00
parent 298c7adcd1
commit ba0bedc5fa
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/eu/siacs/conversations/utils/ExceptionHelper.java
View file

@ -34,6 +34,18 @@ public class ExceptionHelper {
if (neverSend) { if (neverSend) {
return; return;
} }
List<Account> accounts = service.getAccounts();
Account account = null;
for(int i = 0; i < accounts.size(); ++i) {
if (!accounts.get(i).isOptionSet(Account.OPTION_DISABLED)) {
account = accounts.get(i);
break;
}
}
if (account==null) {
return;
}
final Account finalAccount = account;
FileInputStream file = context.openFileInput("stacktrace.txt"); FileInputStream file = context.openFileInput("stacktrace.txt");
InputStreamReader inputStreamReader = new InputStreamReader( InputStreamReader inputStreamReader = new InputStreamReader(
file); file);
@ -54,21 +66,12 @@ public class ExceptionHelper {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
List<Account> accounts = service.getAccounts();
Account account = null; Log.d("xmppService","using account="+finalAccount.getJid()+" to send in stack trace");
for(int i = 0; i < accounts.size(); ++i) { Conversation conversation = service.findOrCreateConversation(finalAccount, "bugs@siacs.eu", false);
if (!accounts.get(i).isOptionSet(Account.OPTION_DISABLED)) {
account = accounts.get(i);
break;
}
}
if (account!=null) {
Log.d("xmppService","using account="+account.getJid()+" to send in stack trace");
Conversation conversation = service.findOrCreateConversation(account, "bugs@siacs.eu", false);
Message message = new Message(conversation, stacktrace.toString(), Message.ENCRYPTION_NONE); Message message = new Message(conversation, stacktrace.toString(), Message.ENCRYPTION_NONE);
service.sendMessage(message, null); service.sendMessage(message, null);
} }
}
}); });
builder.setNegativeButton(context.getText(R.string.send_never),new OnClickListener() { builder.setNegativeButton(context.getText(R.string.send_never),new OnClickListener() {