mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-06-15 19:29:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Target SDK 37

Browse Source
This commit is contained in:
Torsten Grote
2026-05-15 15:53:44 -03:00
parent 9ccc81b96d
commit 02fef43ec1
4 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@@ -17,7 +17,7 @@ android {
defaultConfig {
applicationId = "org.fdroid"
minSdk = 24
targetSdk = 36
targetSdk = 37
versionCode = 2000009
versionName = "2.0-alpha9"

1
app/src/full/AndroidManifest.xml
View File

@@ -36,6 +36,7 @@
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_LOCAL_NETWORK" />
<uses-permission-sdk-23
android:name="android.permission.ACCESS_COARSE_LOCATION"

2
app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java
View File

@@ -78,7 +78,7 @@ public class BluetoothManager {
* so make sure {@link BroadcastReceiver}s handle duplicates.
*/
public static void start(final Context context) {
if (checkSelfPermission(context, BLUETOOTH_CONNECT) != PERMISSION_GRANTED &&
if (checkSelfPermission(context, BLUETOOTH_CONNECT) != PERMISSION_GRANTED ||
checkSelfPermission(context, BLUETOOTH_SCAN) != PERMISSION_GRANTED) {
// TODO we either throw away that Bluetooth code or properly request permissions
return;

44
app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
View File

@@ -1,5 +1,8 @@
package org.fdroid.fdroid.nearby;
import static android.Manifest.permission.ACCESS_LOCAL_NETWORK;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.os.Build.VERSION.SDK_INT;
import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
import static org.fdroid.fdroid.nearby.SwapService.ACTION_REQUEST_SWAP;
@@ -149,6 +152,11 @@ public class SwapWorkflowActivity extends AppCompatActivity {
if (isGranted) sendFDroidBluetooth();
});
private final ActivityResultLauncher<String> requestLocalAccessLauncher =
registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
if (isGranted) sendFDroidBluetooth();
});
public static void requestSwap(Context context, String repo) {
requestSwap(context, Uri.parse(repo));
}
@@ -1092,18 +1100,25 @@ public class SwapWorkflowActivity extends AppCompatActivity {
wifiSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
Context context = getApplicationContext();
if (isChecked) {
boolean granted = SDK_INT < 37 ||
ContextCompat.checkSelfPermission(context, ACCESS_LOCAL_NETWORK) == PERMISSION_GRANTED;
if (isChecked && !granted) {
requestLocalAccessLauncher.launch(ACCESS_LOCAL_NETWORK);
Toast.makeText(this, R.string.swap_bluetooth_permissions, Toast.LENGTH_LONG).show();
}
boolean activate = isChecked && granted;
if (activate) {
if (wifiApControl != null && wifiApControl.isEnabled()) {
setupWifiAP();
} else {
if (Build.VERSION.SDK_INT <= 28) {
if (SDK_INT <= 28) {
wifiManager.setWifiEnabled(true);
}
}
BonjourManager.start(context);
}
BonjourManager.setVisible(context, isChecked);
SwapService.putWifiVisibleUserPreference(isChecked);
BonjourManager.setVisible(context, activate);
SwapService.putWifiVisibleUserPreference(activate);
});
scanQrButton.setOnClickListener(v -> inflateSwapView(R.layout.swap_wifi_qr));
@@ -1143,7 +1158,12 @@ public class SwapWorkflowActivity extends AppCompatActivity {
break;
case BonjourManager.STATUS_STARTED:
textWifiVisible.setText(R.string.swap_not_visible_wifi);
peopleNearbyText.setText(R.string.swap_scanning_for_peers);
if (SDK_INT < 37 ||
ContextCompat.checkSelfPermission(context, ACCESS_LOCAL_NETWORK) == PERMISSION_GRANTED) {
peopleNearbyText.setText(R.string.swap_scanning_for_peers);
} else {
peopleNearbyText.setText(R.string.swap_bluetooth_permissions);
}
peopleNearbyText.setVisibility(View.VISIBLE);
peopleNearbyProgress.setVisibility(View.VISIBLE);
break;
@@ -1152,7 +1172,12 @@ public class SwapWorkflowActivity extends AppCompatActivity {
break;
case BonjourManager.STATUS_NOT_VISIBLE:
textWifiVisible.setText(R.string.swap_not_visible_wifi);
peopleNearbyText.setText(R.string.swap_scanning_for_peers);
if (SDK_INT < 37 ||
ContextCompat.checkSelfPermission(context, ACCESS_LOCAL_NETWORK) == PERMISSION_GRANTED) {
peopleNearbyText.setText(R.string.swap_scanning_for_peers);
} else {
peopleNearbyText.setText(R.string.swap_bluetooth_permissions);
}
peopleNearbyText.setVisibility(View.VISIBLE);
peopleNearbyProgress.setVisibility(View.VISIBLE);
break;
@@ -1162,7 +1187,12 @@ public class SwapWorkflowActivity extends AppCompatActivity {
} else {
textWifiVisible.setText(R.string.swap_visible_wifi);
}
peopleNearbyText.setText(R.string.swap_scanning_for_peers);
if (SDK_INT < 37 ||
ContextCompat.checkSelfPermission(context, ACCESS_LOCAL_NETWORK) == PERMISSION_GRANTED) {
peopleNearbyText.setText(R.string.swap_scanning_for_peers);
} else {
peopleNearbyText.setText(R.string.swap_bluetooth_permissions);
}
peopleNearbyText.setVisibility(View.VISIBLE);
peopleNearbyProgress.setVisibility(View.VISIBLE);
break;