aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-03 23:47:49 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-03 23:47:49 +0100
commit7a9327d9607342a3ece2768ff0e02061dc9132c8 (patch)
tree6326442a85b41331888b6f288320fdc29da11602 /src/main/java/eu/siacs/conversations/ui/XmppActivity.java
parentd458919c8f3e9ff968ed2df3b3492a07794aa477 (diff)
parent08cb23a88675bec7a382a8cdd463e9ea10358f64 (diff)
fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/XmppActivity.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 222f3295..56aa47b0 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -38,6 +38,7 @@ import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
+import android.nfc.NfcAdapter;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.IBinder;
@@ -543,6 +544,15 @@ public abstract class XmppActivity extends Activity {
return false;
}
+ protected void registerNdefPushMessageCallback(NfcAdapter.CreateNdefMessageCallback callback) {
+ if (android.os.Build.VERSION.SDK_INT >= 16) {
+ NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this);
+ if (nfcAdapter != null && nfcAdapter.isEnabled()) {
+ nfcAdapter.setNdefPushMessageCallback(callback, this);
+ }
+ }
+ }
+
public AvatarService avatarService() {
return xmppConnectionService.getAvatarService();
}