diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index c1362f461..2d3ec5fc8 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -858,7 +858,7 @@
android:theme="@android:style/Theme.NoDisplay" />
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java
index 3678637c3..4b300babd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java
@@ -34,7 +34,6 @@ import android.view.ViewGroup;
import android.view.animation.Animation;
import de.cotech.sweetspot.NfcSweetspotData;
-import de.cotech.sweetspot.ShowNfcSweetspotActivity;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ShowNfcSweetspotActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ShowNfcSweetspotActivity.java
new file mode 100644
index 000000000..b3146d2bf
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ShowNfcSweetspotActivity.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2018 Schürmann & Breitmoser GbR
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package org.sufficientlysecure.keychain.ui;
+
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.util.Pair;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.DecelerateInterpolator;
+
+import de.cotech.sweetspot.NfcSweetspotData;
+import org.sufficientlysecure.keychain.securitytoken.SecurityTokenConnection;
+import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
+
+
+public class ShowNfcSweetspotActivity extends BaseSecurityTokenActivity {
+ public static final String EXTRA_TOKEN_INFO = "token_info";
+
+ private View sweetspotIndicator;
+ private View sweetspotIcon;
+ private View sweetspotCircle1;
+ private View sweetspotCircle2;
+ private View sweetspotCircle3;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ setTheme(android.R.style.Theme_Translucent_NoTitleBar_Fullscreen);
+ overridePendingTransition(de.cotech.sweetspot.R.anim.fade_in_quick, de.cotech.sweetspot.R.anim.fade_out_quick);
+
+ super.onCreate(savedInstanceState);
+
+ setContentView(de.cotech.sweetspot.R.layout.activity_nfc_sweetspot);
+ sweetspotIndicator = findViewById(de.cotech.sweetspot.R.id.indicator_nfc_sweetspot);
+
+ Pair nfcPosition = NfcSweetspotData.getSweetspotForBuildModel();
+ if (nfcPosition == null) {
+ throw new IllegalArgumentException("No data available for this model. This activity should not be called!");
+ }
+ DisplayMetrics displayDimensions = getDisplaySize();
+
+ final float translationX = (float) (displayDimensions.widthPixels * nfcPosition.first);
+ final float translationY = (float) (displayDimensions.heightPixels * nfcPosition.second);
+
+ sweetspotIndicator.post(() -> {
+ sweetspotIndicator.setTranslationX(translationX - sweetspotIndicator.getWidth() / 2);
+ sweetspotIndicator.setTranslationY(translationY - sweetspotIndicator.getHeight() / 2);
+ });
+
+ sweetspotIcon = findViewById(de.cotech.sweetspot.R.id.icon_nfc_sweetspot);
+ sweetspotCircle1 = findViewById(de.cotech.sweetspot.R.id.circle_nfc_sweetspot_1);
+ sweetspotCircle2 = findViewById(de.cotech.sweetspot.R.id.circle_nfc_sweetspot_2);
+ sweetspotCircle3 = findViewById(de.cotech.sweetspot.R.id.circle_nfc_sweetspot_3);
+
+ sweetspotIcon.setAlpha(0.0f);
+ sweetspotCircle1.setAlpha(0.0f);
+ sweetspotCircle2.setAlpha(0.0f);
+ sweetspotCircle3.setAlpha(0.0f);
+ }
+
+ @Override
+ protected void onSecurityTokenPostExecute(SecurityTokenConnection stConnection) {
+ Intent result = new Intent();
+ result.putExtra(EXTRA_TOKEN_INFO, tokenInfo);
+ setResult(Activity.RESULT_OK, result);
+ finish();
+ }
+
+ @Override
+ public void onEnterAnimationComplete() {
+ super.onEnterAnimationComplete();
+
+ DecelerateInterpolator interpolator = new DecelerateInterpolator();
+ sweetspotIcon.animate().alpha(1.0f).setInterpolator(interpolator).setDuration(300).start();
+ sweetspotCircle1.animate().alpha(1.0f).setInterpolator(interpolator).setDuration(500).setStartDelay(100).start();
+ sweetspotCircle2.animate().alpha(1.0f).setInterpolator(interpolator).setDuration(700).setStartDelay(200).start();
+ sweetspotCircle3.animate().alpha(1.0f).setInterpolator(interpolator).setDuration(1000).setStartDelay(300).start();
+ }
+
+ @Override
+ public void finish() {
+ super.finish();
+
+ overridePendingTransition(de.cotech.sweetspot.R.anim.fade_in_quick, de.cotech.sweetspot.R.anim.fade_out_quick);
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ if (event.getActionMasked() == MotionEvent.ACTION_UP) {
+ setResult(Activity.RESULT_CANCELED);
+ finish();
+ return true;
+ }
+
+ return super.onTouchEvent(event);
+ }
+
+ private DisplayMetrics getDisplaySize() {
+ DisplayMetrics metrics = new DisplayMetrics();
+ getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+ return metrics;
+ }
+}