diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index f0b827778..34fed2e54 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -29,7 +29,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.Button;
-import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
@@ -56,7 +55,6 @@ import com.google.zxing.integration.android.IntentResult;
import org.fdroid.fdroid.BuildConfig;
import org.fdroid.fdroid.FDroidApp;
-import org.fdroid.fdroid.NfcHelper;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils;
@@ -211,8 +209,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
nextStep = R.layout.swap_select_apps;
} else if (currentView.getLayoutResId() == R.layout.swap_join_wifi) {
nextStep = R.layout.swap_start_swap;
- } else if (currentView.getLayoutResId() == R.layout.swap_nfc) {
- nextStep = R.layout.swap_join_wifi;
} else if (currentView.getLayoutResId() == R.layout.swap_select_apps) {
if (!backstack.isEmpty() && backstack.peek() == R.layout.swap_start_swap) {
nextStep = R.layout.swap_start_swap;
@@ -309,10 +305,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
menuInflater.inflate(R.menu.swap_next, menu);
setUpNextButton(menu, R.string.next, R.drawable.ic_arrow_forward);
return true;
- } else if (currentView.getLayoutResId() == R.layout.swap_nfc) {
- menuInflater.inflate(R.menu.swap_next, menu);
- setUpNextButton(menu, R.string.skip, R.drawable.ic_arrow_forward);
- return true;
}
return super.onPrepareOptionsMenu(menu);
@@ -342,8 +334,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
onAppsSelected();
} else if (currentLayoutResId == R.layout.swap_join_wifi) {
inflateSwapView(R.layout.swap_select_apps);
- } else if (currentLayoutResId == R.layout.swap_nfc) {
- inflateSwapView(R.layout.swap_wifi_qr);
}
}
@@ -527,11 +517,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
if (currentSwapViewLayoutRes == R.layout.swap_start_swap) {
showIntro();
return;
- } else if (currentSwapViewLayoutRes == R.layout.swap_nfc) {
- if (!attemptToShowNfc()) {
- inflateSwapView(R.layout.swap_wifi_qr);
- return;
- }
} else if (currentSwapViewLayoutRes == R.layout.swap_connecting) {
// TODO: Properly decide what to do here (i.e. returning to the activity after it was connecting)...
inflateSwapView(R.layout.swap_start_swap);
@@ -624,8 +609,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
} else if (currentView.getLayoutResId() == R.layout.swap_wifi_qr) {
setUpFromWifi();
setUpQrScannerButton();
- } else if (currentView.getLayoutResId() == R.layout.swap_nfc) {
- setUpNfcView();
} else if (currentView.getLayoutResId() == R.layout.swap_select_apps) {
LocalRepoService.create(this, getSwapService().getAppsToSwap());
} else if (currentView.getLayoutResId() == R.layout.swap_connecting) {
@@ -730,7 +713,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
hasPreparedLocalRepo = true;
if (getSwapService().isConnectingWithPeer()) {
startSwappingWithPeer();
- } else if (!attemptToShowNfc()) {
+ } else {
inflateSwapView(R.layout.swap_wifi_qr);
}
}
@@ -740,23 +723,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
inflateSwapView(R.layout.swap_connecting);
}
- private boolean attemptToShowNfc() {
- // TODO: What if NFC is disabled? Hook up with NfcNotEnabledActivity? Or maybe only if they
- // click a relevant button?
-
- // Even if they opted to skip the message which says "Touch devices to swap",
- // we still want to actually enable the feature, so that they could touch
- // during the wifi qr code being shown too.
- boolean nfcMessageReady = NfcHelper.setPushMessage(this, Utils.getSharingUri(FDroidApp.repo));
-
- // TODO move all swap-specific preferences to a SharedPreferences instance for SwapWorkflowActivity
- if (Preferences.get().showNfcDuringSwap() && nfcMessageReady) {
- inflateSwapView(R.layout.swap_nfc);
- return true;
- }
- return false;
- }
-
public void swapWith(Peer peer) {
getSwapService().swapWith(peer);
inflateSwapView(R.layout.swap_select_apps);
@@ -1405,14 +1371,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
}
}
- private void setUpNfcView() {
- CheckBox dontShowAgain = container.findViewById(R.id.checkbox_dont_show);
- if (dontShowAgain != null) {
- dontShowAgain.setOnCheckedChangeListener((buttonView, isChecked)
- -> Preferences.get().setShowNfcDuringSwap(!isChecked));
- }
- }
-
private void setUpConnectingProgressText(String message) {
TextView progressText = container.findViewById(R.id.progress_text);
if (progressText != null && message != null) {
diff --git a/app/src/full/res/drawable-hdpi/nfc_touch.png b/app/src/full/res/drawable-hdpi/nfc_touch.png
deleted file mode 100644
index 1bdb44151..000000000
Binary files a/app/src/full/res/drawable-hdpi/nfc_touch.png and /dev/null differ
diff --git a/app/src/full/res/drawable-ldpi/nfc_touch.png b/app/src/full/res/drawable-ldpi/nfc_touch.png
deleted file mode 100644
index eca6ddcb8..000000000
Binary files a/app/src/full/res/drawable-ldpi/nfc_touch.png and /dev/null differ
diff --git a/app/src/full/res/drawable-mdpi/nfc_touch.png b/app/src/full/res/drawable-mdpi/nfc_touch.png
deleted file mode 100644
index 1bc0c4d37..000000000
Binary files a/app/src/full/res/drawable-mdpi/nfc_touch.png and /dev/null differ
diff --git a/app/src/full/res/drawable-xhdpi/nfc_touch.png b/app/src/full/res/drawable-xhdpi/nfc_touch.png
deleted file mode 100644
index 17482a0fa..000000000
Binary files a/app/src/full/res/drawable-xhdpi/nfc_touch.png and /dev/null differ
diff --git a/app/src/full/res/layout/swap_nfc.xml b/app/src/full/res/layout/swap_nfc.xml
deleted file mode 100644
index c970ab430..000000000
--- a/app/src/full/res/layout/swap_nfc.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 483c294d8..8355c4a22 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -260,11 +260,6 @@
android:screenOrientation="fullSensor"
tools:replace="screenOrientation" />
-
-
0 due to incompatible apps resulting in an empty list.
- callbacks.disableAndroidBeam();
progressLayout.setVisibility(View.GONE);
// Set Install button and hide second button
buttonPrimaryView.setText(R.string.menu_install);
buttonPrimaryView.setEnabled(true);
buttonPrimaryView.setOnClickListener(v -> callbacks.installApk(suggestedApk));
} else if (app.isInstalled(context)) {
- callbacks.enableAndroidBeam();
if (app.canAndWantToUpdate(suggestedApk) && suggestedApk != null) {
buttonPrimaryView.setText(R.string.menu_upgrade);
buttonPrimaryView.setOnClickListener(v -> callbacks.installApk(suggestedApk));
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
index d803909da..e11e60f13 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
@@ -48,7 +48,6 @@ import com.google.android.material.bottomnavigation.BottomNavigationView;
import org.fdroid.fdroid.AppUpdateStatusManager;
import org.fdroid.fdroid.FDroidApp;
-import org.fdroid.fdroid.NfcHelper;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.UpdateService;
@@ -195,9 +194,6 @@ public class MainActivity extends AppCompatActivity {
FDroidApp.checkStartTor(this, Preferences.get());
- // AppDetailsActivity and RepoDetailsActivity set different NFC actions, so reset here
- NfcHelper.setAndroidBeam(this, getApplication().getPackageName());
-
NearbyViewBinder.updateExternalStorageViews(this);
}
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.java
index f90994cd2..a2addf27f 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.java
@@ -45,8 +45,6 @@ import org.fdroid.database.Repository;
import org.fdroid.database.RepositoryDao;
import org.fdroid.download.Mirror;
import org.fdroid.fdroid.FDroidApp;
-import org.fdroid.fdroid.NfcHelper;
-import org.fdroid.fdroid.NfcNotEnabledActivity;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.UpdateService;
import org.fdroid.fdroid.Utils;
@@ -206,12 +204,6 @@ public class RepoDetailsActivity extends AppCompatActivity {
super.onDestroy();
}
- private void setNfc() {
- if (NfcHelper.setPushMessage(this, Utils.getSharingUri(repo))) {
- findViewById(android.R.id.content).post(() -> onNewIntent(getIntent()));
- }
- }
-
@Override
public void onResume() {
super.onResume();
@@ -228,8 +220,6 @@ public class RepoDetailsActivity extends AppCompatActivity {
LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver,
new IntentFilter(UpdateService.LOCAL_ACTION_STATUS));
- // FDroid.java and AppDetailsActivity set different NFC actions, so reset here
- setNfc();
processIntent(getIntent());
}
@@ -286,10 +276,6 @@ public class RepoDetailsActivity extends AppCompatActivity {
} else if (itemId == R.id.menu_delete) {
promptForDelete();
return true;
- } else if (itemId == R.id.menu_enable_nfc) {
- intent = new Intent(this, NfcNotEnabledActivity.class);
- startActivity(intent);
- return true;
} else if (itemId == R.id.action_share) {
intent = new Intent(Intent.ACTION_SEND);
intent.setType("text/plain");
@@ -303,26 +289,10 @@ public class RepoDetailsActivity extends AppCompatActivity {
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
- prepareNfcMenuItems(menu);
prepareShareMenuItems(menu);
return true;
}
- private void prepareNfcMenuItems(Menu menu) {
- NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this);
- MenuItem menuItem = menu.findItem(R.id.menu_enable_nfc);
-
- if (nfcAdapter == null) {
- menuItem.setVisible(false);
- return;
- }
-
- boolean needsEnableNfcMenuItem;
- needsEnableNfcMenuItem = false; // TODO remove NFC code
-
- menuItem.setVisible(needsEnableNfcMenuItem);
- }
-
private void prepareShareMenuItems(Menu menu) {
if (!TextUtils.isEmpty(repo.getAddress())) {
if (!TextUtils.isEmpty(repo.getCertificate())) {
diff --git a/app/src/main/res/drawable/ic_nfc.xml b/app/src/main/res/drawable/ic_nfc.xml
deleted file mode 100644
index 68eae50c7..000000000
--- a/app/src/main/res/drawable/ic_nfc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/menu/repo_details_activity.xml b/app/src/main/res/menu/repo_details_activity.xml
index 3d064a35c..52d663a53 100644
--- a/app/src/main/res/menu/repo_details_activity.xml
+++ b/app/src/main/res/menu/repo_details_activity.xml
@@ -8,11 +8,6 @@
android:icon="@drawable/ic_share"
android:title="@string/menu_share"
app:showAsAction="ifRoom|withText" />
-
- Version
by %s
Delete
- Enable NFC Send…
Prompt to send crash reports
Gather data about crashes and ask to send them to the
developer
@@ -551,10 +550,6 @@ This often occurs with apps installed via Google Play or other sources, if they
F-Droid can search for repos and mirrors on your SD Card, but needs your permission to do so.
Try it
-
- Touch to swap
- If your friend has F-Droid and NFC turned on touch your devices together.
-
Join the same Wi-Fi as your friend
To swap using Wi-Fi, ensure you are on the same network. If you don\'t have
access to the same network, one of you can create a Wi-Fi Hotspot.
diff --git a/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java b/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java
index 8c657074b..aa321347c 100644
--- a/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java
@@ -113,16 +113,6 @@ public class AppDetailsAdapterTest {
return false;
}
- @Override
- public void enableAndroidBeam() {
-
- }
-
- @Override
- public void disableAndroidBeam() {
-
- }
-
@Override
public void openUrl(String url) {