demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-10 17:11:56 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Discovery Activity: Replace long toasts with dialog

Browse Source
This commit is contained in:
José Rebelo 2024-09-28 23:02:20 +01:00
parent 03596ac0fb
commit dc8d295d4a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
View File

@ -65,6 +65,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.RequiresPermission;
import androidx.annotation.StringRes;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.core.view.MenuProvider;
@ -516,6 +517,13 @@ public class DiscoveryActivityV2 extends AbstractGBActivity implements AdapterVi
return message;
}
private void showWarnDialog(@StringRes final int message) {
new MaterialAlertDialogBuilder(getContext())
.setMessage(message)
.setPositiveButton(R.string.ok, (dialog, whichButton) -> {})
.show();
}
private void checkAndRequestLocationPermission() {
/* This is more or less a copy of what's in ControlCenterv2, but
we do this in case the permissions weren't requested since there
@ -619,10 +627,10 @@ public class DiscoveryActivityV2 extends AbstractGBActivity implements AdapterVi
final String authKey = sharedPrefs.getString("authkey", null);
if (authKey == null || authKey.isEmpty()) {
toast(DiscoveryActivityV2.this, getString(R.string.discovery_need_to_enter_authkey), Toast.LENGTH_LONG, GB.WARN);
showWarnDialog(R.string.discovery_need_to_enter_authkey);
return;
} else if (!coordinator.validateAuthKey(authKey)) {
toast(DiscoveryActivityV2.this, getString(R.string.discovery_entered_invalid_authkey), Toast.LENGTH_LONG, GB.WARN);
showWarnDialog(R.string.discovery_entered_invalid_authkey);
return;
}
}