diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-11-04 17:10:35 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-11-04 17:10:35 +0100 |
commit | b824e55277cf4a4a9042dc0fe30d0cc8939445dc (patch) | |
tree | 1b4bf896006988ac2eff135b30fdbb4384344501 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
parent | 11ecf43da7b3b850866402eea17627b3988309aa (diff) |
register nfc callback in every activity that provides a proper sharable uri
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 14 |
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(); |