diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2020-11-04 20:42:14 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2020-11-04 20:42:14 -0800 |
| commit | a4d72345c288263348d1fbe62938528f913cc57b (patch) | |
| tree | 9cd3be086f0353dd58f67e97f619d48e0c66ced4 /app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java | |
| parent | 1c2d783f4bc7ad16b7cd4e323317d10e0b20432a (diff) | |
| parent | f4edc8f502279fa4eb1a52652c3f57b209202ecf (diff) | |
| download | dsub-a4d72345c288263348d1fbe62938528f913cc57b.tar.gz dsub-a4d72345c288263348d1fbe62938528f913cc57b.tar.bz2 dsub-a4d72345c288263348d1fbe62938528f913cc57b.zip | |
Merge branch 'target-sdk-29' into edge
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java')
| -rw-r--r-- | app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java index 3b6935eb..d475be7b 100644 --- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -18,6 +18,7 @@ */ package github.daneren2005.dsub.activity; +import android.Manifest; import android.app.UiModeManager; import android.content.Context; import android.content.DialogInterface; @@ -184,6 +185,17 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte if (ContextCompat.checkSelfPermission(this, permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { ActivityCompat.requestPermissions(this, new String[]{ permission.WRITE_EXTERNAL_STORAGE }, PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE); } + + SharedPreferences prefs = Util.getPreferences(this); + int instance = prefs.getInt(Constants.PREFERENCES_KEY_SERVER_INSTANCE, 1); + String expectedSSID = prefs.getString(Constants.PREFERENCES_KEY_SERVER_LOCAL_NETWORK_SSID + instance, ""); + if(!expectedSSID.isEmpty()) { + String currentSSID = Util.getSSID(this); + + if(currentSSID == "<unknown ssid>" && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { + ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, SubsonicActivity.PERMISSIONS_REQUEST_LOCATION); + } + } } @Override @@ -204,7 +216,6 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte } else { Util.toast(this, R.string.permission_location_failed); - finish(); } } } |