aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-20 02:29:46 +0100
committerlookshe <github@lookshe.org>2016-03-20 02:29:46 +0100
commitad8e8344c0c051dd22adf76df624dd16cabcea28 (patch)
treea8e5818ef393087eb406df9d26bef3b36caa3f75 /src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java
parent6de11f38eaeb758692e0690f7150556d46d1f674 (diff)
parentfb00372269ab0ed9ed0fbc1bd502695ffc17dd1b (diff)
Merge branch 'trz/rebase' (early part) into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java
index af253730..23601f44 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java
@@ -184,7 +184,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
}
return true;
} else {
- return onOptionsItemSelected(item);
+ return super.onOptionsItemSelected(item);
}
}