WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[app] Fix registerForActivityResult (#861)

This commit is contained in:
vvb2060 2021-08-07 00:46:28 +08:00 committed by GitHub
parent 0b00570751
commit 389843c508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
app/src/main/java/org/lsposed/manager/ui/fragment/LogsFragment.java
View File

@ -34,6 +34,7 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts; import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -79,6 +80,32 @@ public class LogsFragment extends BaseFragment {
private final Handler handler = new Handler(Looper.getMainLooper()); private final Handler handler = new Handler(Looper.getMainLooper());
private FragmentLogsBinding binding; private FragmentLogsBinding binding;
private LinearLayoutManagerFix layoutManager; private LinearLayoutManagerFix layoutManager;
private final ActivityResultLauncher<String> saveLogsLauncher = registerForActivityResult(
new ActivityResultContracts.CreateDocument(),
uri -> {
if (uri == null) return;
try {
// grantUriPermission might throw RemoteException on MIUI
requireContext().grantUriPermission(BuildConfig.APPLICATION_ID, uri,
Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
} catch (Exception e) {
e.printStackTrace();
}
AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
var parcelFileDescriptor = ConfigManager.getLogs(verbose);
if (parcelFileDescriptor == null) {
return;
}
try (var os = requireContext().getContentResolver().openOutputStream(uri);
var is = new FileInputStream(parcelFileDescriptor.getFileDescriptor())) {
FileUtils.copy(is, os);
} catch (IOException e) {
var str = getResources().getString(R.string.logs_save_failed);
Snackbar.make(binding.snackbar, str + "\n" + e.getMessage(),
Snackbar.LENGTH_LONG).show();
}
});
});
@Nullable @Nullable
@Override @Override
@ -245,32 +272,6 @@ public class LogsFragment extends BaseFragment {
"LSPosed_%s_%s.log", "LSPosed_%s_%s.log",
verbose ? "Verbose" : "Modules", verbose ? "Verbose" : "Modules",
now.toString()); now.toString());
var contract = new ActivityResultContracts.CreateDocument();
var saveLogsLauncher = registerForActivityResult(contract,
uri -> {
if (uri == null) return;
try {
// grantUriPermission might throw RemoteException on MIUI
requireContext().grantUriPermission(BuildConfig.APPLICATION_ID, uri,
Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
} catch (Exception e) {
e.printStackTrace();
}
AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
try (var os = requireContext().getContentResolver().openOutputStream(uri)) {
ParcelFileDescriptor parcelFileDescriptor = ConfigManager.getLogs(verbose);
if (parcelFileDescriptor == null) {
return;
}
try (var is = new FileInputStream(parcelFileDescriptor.getFileDescriptor())) {
FileUtils.copy(is, os);
}
} catch (Exception e) {
Snackbar.make(binding.snackbar, getResources().getString(R.string.logs_save_failed) + "\n" +
e.getMessage(), Snackbar.LENGTH_LONG).show();
}
});
});
saveLogsLauncher.launch(filename); saveLogsLauncher.launch(filename);
} }