From b144e834248abe7749e4fa815abe62d9c7a292c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BCrkle?= Date: Mon, 15 Feb 2016 17:31:58 +0100 Subject: [PATCH] silence unnecessary toasts (Internal Error, Login sucessfull) --- .../inovex/zabbixmobile/ExceptionBroadcastReceiver.java | 8 +++++--- .../com/inovex/zabbixmobile/activities/BaseActivity.java | 7 +++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/inovex/zabbixmobile/ExceptionBroadcastReceiver.java b/src/main/java/com/inovex/zabbixmobile/ExceptionBroadcastReceiver.java index be82f440..cd73eded 100644 --- a/src/main/java/com/inovex/zabbixmobile/ExceptionBroadcastReceiver.java +++ b/src/main/java/com/inovex/zabbixmobile/ExceptionBroadcastReceiver.java @@ -34,10 +34,12 @@ public class ExceptionBroadcastReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { String message = intent.getStringExtra(EXTRA_MESSAGE); - if (message == null) { - message = context.getString(R.string.exc_internal_error); +// if (message == null) { +// message = context.getString(R.string.exc_internal_error); +// } + if(message != null){ + Toast.makeText(context, message, Toast.LENGTH_LONG).show(); } - Toast.makeText(context, message, Toast.LENGTH_LONG).show(); } } \ No newline at end of file diff --git a/src/main/java/com/inovex/zabbixmobile/activities/BaseActivity.java b/src/main/java/com/inovex/zabbixmobile/activities/BaseActivity.java index 619c3a42..f909d5d1 100644 --- a/src/main/java/com/inovex/zabbixmobile/activities/BaseActivity.java +++ b/src/main/java/com/inovex/zabbixmobile/activities/BaseActivity.java @@ -49,7 +49,6 @@ import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.TextView; -import android.widget.Toast; import com.inovex.zabbixmobile.OnSettingsMigratedReceiver; import com.inovex.zabbixmobile.R; @@ -581,9 +580,9 @@ public void onLoginFinished(boolean success, boolean showToast) { } } if (success) { - if (showToast) - Toast.makeText(this, R.string.zabbix_login_successful, - Toast.LENGTH_LONG).show(); +// if (showToast) +// Toast.makeText(this, R.string.zabbix_login_successful, +// Toast.LENGTH_LONG).show(); loadData(); } }