Skip to content

Commit 3cb499c

Browse files
committed
Update SR api to 1.0.0-alpha02
Signed-off-by: Fung Gwo <fython@163.com>
1 parent 69f6f8f commit 3cb499c

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ dependencies {
3333
implementation "androidx.recyclerview:recyclerview:1.0.0"
3434
implementation 'io.reactivex.rxjava2:rxjava:2.2.7'
3535
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
36-
implementation 'moe.shizuku.redirectstorage:api:1.0.0-alpha1'
36+
implementation 'moe.shizuku.redirectstorage:api:1.0.0-alpha2'
3737
}

app/src/main/java/app/gwo/safenhancer/lite/ProxyCameraActivity.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,23 @@ private void getExtrasFromCaptureIntent(@NonNull Intent intent) {
9696
&& "file".equals(mExpectedOutput.getScheme())
9797
&& referrerPackage != null
9898
&& Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
99-
&& StorageRedirectManager.installed(getPackageManager())
99+
&& StorageRedirectManager.isSupported(getPackageManager())
100100
&& checkSelfPermission(StorageRedirectManager.PERMISSION) == PERMISSION_GRANTED
101101
) {
102102
StorageRedirectManager srm = StorageRedirectManager.create();
103103
if (srm != null) {
104104
try {
105105
RedirectPackageInfo rpi = srm.getRedirectPackageInfo(
106106
referrerPackage, 0, 0);
107-
if (rpi != null && rpi.enabled && rpi.redirectTarget != null) {
107+
if (rpi != null && rpi.enabled) {
108108
Log.d(TAG, "Package " + referrerPackage + " is enabled redirect.");
109109
String originalPath = mExpectedOutput.toString();
110110
String externalRoot = Environment.getExternalStorageDirectory()
111111
.getAbsolutePath();
112112
String redirectTarget = rpi.redirectTarget;
113+
if (redirectTarget == null) {
114+
redirectTarget = srm.getDefaultRedirectTarget();
115+
}
113116
if (rpi.redirectTarget.contains("%s")) {
114117
redirectTarget = String.format(redirectTarget, referrerPackage);
115118
}

app/src/main/java/app/gwo/safenhancer/lite/SettingsActivity.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
9696
}
9797
return false;
9898
});
99-
mSRPermission.setEnabled(
100-
Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
101-
StorageRedirectManager.installed(pm)
102-
);
99+
mSRPermission.setEnabled(StorageRedirectManager.isSupported(pm));
103100
mSRPermission.setChecked(
104101
Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
105102
getActivity().checkSelfPermission(StorageRedirectManager.PERMISSION)

0 commit comments

Comments
 (0)