From dfed7d3c93ccc382b97f59ef7f7a0ce456ded88d Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 12 Oct 2017 10:05:00 +0200 Subject: [PATCH] Move decision of whether to show button into ShowNfcSweetspotActivity --- .../keychain/ui/CreateSecurityTokenWaitFragment.java | 10 ++++------ .../keychain/ui/ShowNfcSweetspotActivity.java | 4 ++++ 2 files changed, 8 insertions(+), 6 deletions(-) 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 437342209..ad4eab1de 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java @@ -20,7 +20,6 @@ package org.sufficientlysecure.keychain.ui; import android.content.Context; import android.content.Intent; -import android.os.Build; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; @@ -36,7 +35,6 @@ import android.view.animation.Animation; import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.securitytoken.NfcSweetspotData; import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo; import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction; import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity; @@ -94,10 +92,10 @@ public class CreateSecurityTokenWaitFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.create_security_token_wait_fragment, container, false); - boolean showLocateHotspot = NfcSweetspotData.SWEETSPOT_DATA.containsKey(Build.MODEL); - View locateHotspotView = view.findViewById(R.id.button_locate_nfc); - locateHotspotView.setVisibility(showLocateHotspot ? View.VISIBLE : View.GONE); - locateHotspotView.setOnClickListener(new OnClickListener() { + boolean showLocateSweetspot = ShowNfcSweetspotActivity.hasSweetspotData(); + View buttonLocateSweetspot = view.findViewById(R.id.button_locate_nfc); + buttonLocateSweetspot.setVisibility(showLocateSweetspot ? View.VISIBLE : View.GONE); + buttonLocateSweetspot.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { Intent intent = new Intent(getActivity(), ShowNfcSweetspotActivity.class); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ShowNfcSweetspotActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ShowNfcSweetspotActivity.java index 549687b18..1a3f4cef3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ShowNfcSweetspotActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ShowNfcSweetspotActivity.java @@ -113,4 +113,8 @@ public class ShowNfcSweetspotActivity extends BaseSecurityTokenActivity { return metrics; } + + public static boolean hasSweetspotData() { + return NfcSweetspotData.SWEETSPOT_DATA.containsKey(Build.MODEL); + } }