aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-02-11 22:36:17 +0100
committersteckbrief <steckbrief@chefmail.de>2016-02-11 22:40:48 +0100
commit9c87e2269cc1d427fab42047cd8993b6bfb07b6f (patch)
treecff8d8c37e416b43c8eb84216116883bdf1655fa /src/main/java/eu/siacs/conversations/ui/XmppActivity.java
parentd38b3c2cf2134738781da626fa7ed49046c9a00f (diff)
Compilation errors and merge mixups fixed
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/XmppActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 3d3207e4..efb498ac 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -548,7 +548,7 @@ public abstract class XmppActivity extends Activity {
});
}
- protected void displayErrorDialog(final int errorCode) {
+ public void displayErrorDialog(final int errorCode) {
runOnUiThread(new Runnable() {
@Override