1 files changed, 1 insertions, 13 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 85b05e5b..6c3dff87 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -116,7 +116,7 @@ public class ConversationActivity extends XmppActivity implements
 		if (conversation!=null) {
 			return "xmpp:"+conversation.getAccount().getJid();
 		} else {
-			return super.getShareableUri();
+			return "";
 		}
 	}
 
@@ -660,18 +660,6 @@ public class ConversationActivity extends XmppActivity implements
 	}
 
 	@Override
-	public void onResume() {
-		super.onResume();
-		this.registerNdefPushMessageCallback();
-	}
-
-	@Override
-	public void onPause() {
-		super.onPause();
-		this.unregisterNdefPushMessageCallback();
-	}
-
-	@Override
 	protected void onStop() {
 		if (xmppConnectionServiceBound) {
 			xmppConnectionService.removeOnConversationListChangedListener();