Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start recording after storage permissions are granted #783

Merged
merged 1 commit into from
Apr 5, 2020
Merged

Start recording after storage permissions are granted #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions app/src/main/java/net/programmierecke/radiodroid2/ActivityMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ public class ActivityMain extends AppCompatActivity implements SearchView.OnQuer

public static final int PERM_REQ_STORAGE_FAV_SAVE = 1;
public static final int PERM_REQ_STORAGE_FAV_LOAD = 2;
public static final int PERM_REQ_STORAGE_RECORD = 3;

private SearchView mSearchView;

Expand Down Expand Up @@ -421,23 +420,9 @@ public void onRequestPermissionsResult(int requestCode,
Log.d(TAG, "on request permissions result:" + requestCode);
}

super.onRequestPermissionsResult(requestCode, permissions, grantResults);

switch (requestCode) {
case PERM_REQ_STORAGE_RECORD: {
// If request is cancelled, the result arrays are empty.
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
Fragment currentFragment = mFragmentManager.getFragments().get(mFragmentManager.getFragments().size() - 1);
if (currentFragment instanceof IFragmentRefreshable) {
if (BuildConfig.DEBUG) {
Log.d(TAG, "REFRESH VIEW");
}
((IFragmentRefreshable) currentFragment).Refresh();
}
} else {
Toast toast = Toast.makeText(this, getResources().getString(R.string.error_record_needs_write), Toast.LENGTH_SHORT);
toast.show();
}
return;
}
case PERM_REQ_STORAGE_FAV_LOAD: {
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
LoadFavourites();
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/net/programmierecke/radiodroid2/FragmentPlayerFull.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
public class FragmentPlayerFull extends Fragment {
private final String TAG = "FragmentPlayerFull";

private final static int PERM_REQ_STORAGE_RECORD = 1001;

/**
* Fragment may be a part of another view which could be dragged/scrolled
* and certain hacks may require the fragment to request them to stop
Expand Down Expand Up @@ -325,7 +327,7 @@ public void onClick(View view) {
if (PlayerServiceUtil.isRecording()) {
PlayerServiceUtil.stopRecording();
} else {
if (Utils.verifyStoragePermissions(getActivity(), ActivityMain.PERM_REQ_STORAGE_RECORD)) {
if (Utils.verifyStoragePermissions(FragmentPlayerFull.this, PERM_REQ_STORAGE_RECORD)) {
PlayerServiceUtil.startRecording();
}
}
Expand Down Expand Up @@ -844,7 +846,7 @@ protected void run(FragmentPlayerFull fragmentPlayerFull) {
public void onRequestPermissionsResult(int requestCode,
@NonNull String[] permissions, @NonNull int[] grantResults) {
// If request is cancelled, the result arrays are empty.
if (requestCode == ActivityMain.PERM_REQ_STORAGE_RECORD) {
if (requestCode == PERM_REQ_STORAGE_RECORD) {
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
storagePermissionsDenied = false;
PlayerServiceUtil.startRecording();
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/java/net/programmierecke/radiodroid2/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,19 @@ public static boolean verifyStoragePermissions(Activity activity, int request_id
return true;
}

public static boolean verifyStoragePermissions(Fragment fragment, int request_id) {
// Check if we have write permission
int permission = ContextCompat.checkSelfPermission(fragment.requireContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE);

if (permission != PackageManager.PERMISSION_GRANTED) {
// We don't have permission so prompt the user
fragment.requestPermissions(PERMISSIONS_STORAGE, request_id);
return false;
}

return true;
}

public static String getReadableBytes(double bytes) {
String[] str = new String[]{"B", "KB", "MB", "GB", "TB"};
for (String aStr : str) {
Expand Down