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

Fix compile dialog crash

This commit is contained in:
tehcneko 2021-01-29 11:55:13 +08:00
parent ed2e19339c
commit 84ad87abf0
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/src/main/java/io/github/lsposed/manager/ui/fragment/CompileDialogFragment.java
View File

@ -16,16 +16,15 @@ import androidx.appcompat.app.AppCompatDialogFragment;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.topjohnwu.superuser.Shell; import com.topjohnwu.superuser.Shell;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
import io.github.lsposed.manager.App; import io.github.lsposed.manager.App;
import io.github.lsposed.manager.R; import io.github.lsposed.manager.R;
import io.github.lsposed.manager.databinding.FragmentCompileDialogBinding; import io.github.lsposed.manager.databinding.FragmentCompileDialogBinding;
import io.github.lsposed.manager.util.CompileUtil; import io.github.lsposed.manager.util.CompileUtil;
import io.github.lsposed.manager.util.ToastUtil; import io.github.lsposed.manager.util.ToastUtil;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
import rikka.shizuku.ShizukuSystemProperties; import rikka.shizuku.ShizukuSystemProperties;
import static android.content.pm.PackageManager.PERMISSION_DENIED; import static android.content.pm.PackageManager.PERMISSION_DENIED;
@ -105,8 +104,12 @@ public class CompileDialogFragment extends AppCompatDialogFragment {
break; break;
} }
App.runOnUiThread(() -> { App.runOnUiThread(() -> {
ToastUtil.showLongToast(requireContext(), R.string.done); ToastUtil.showLongToast(App.getInstance(), R.string.done);
dismiss(); try {
dismissAllowingStateLoss();
} catch (Exception e) {
e.printStackTrace();
}
}); });
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -136,7 +139,11 @@ public class CompileDialogFragment extends AppCompatDialogFragment {
break; break;
} }
} else { } else {
try {
dismissAllowingStateLoss(); dismissAllowingStateLoss();
} catch (Exception e) {
e.printStackTrace();
}
} }
} }
@ -152,7 +159,11 @@ public class CompileDialogFragment extends AppCompatDialogFragment {
if (command != null) { if (command != null) {
new CompileTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, command); new CompileTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, command);
} else { } else {
dismiss(); try {
dismissAllowingStateLoss();
} catch (Exception e) {
e.printStackTrace();
}
} }
} }
@ -167,7 +178,7 @@ public class CompileDialogFragment extends AppCompatDialogFragment {
@Override @Override
protected String doInBackground(String... commands) { protected String doInBackground(String... commands) {
if (outerRef.get() == null) { if (outerRef.get() == null) {
return outerRef.get().requireContext().getString(R.string.compile_failed); return App.getInstance().getString(R.string.compile_failed);
} }
// Also get STDERR // Also get STDERR
List<String> stdout = new ArrayList<>(); List<String> stdout = new ArrayList<>();
@ -184,18 +195,19 @@ public class CompileDialogFragment extends AppCompatDialogFragment {
@Override @Override
protected void onPostExecute(String result) { protected void onPostExecute(String result) {
if (outerRef.get() == null || !outerRef.get().isAdded()) { try {
return;
}
Context ctx = outerRef.get().requireContext();
if (result.length() == 0) {
ToastUtil.showLongToast(ctx, R.string.compile_failed);
} else if (result.length() >= 5 && "Error".equals(result.substring(0, 5))) {
ToastUtil.showLongToast(ctx, ctx.getString(R.string.compile_failed_with_info) + " " + result.substring(6));
} else {
ToastUtil.showLongToast(ctx, R.string.done);
}
outerRef.get().dismissAllowingStateLoss(); outerRef.get().dismissAllowingStateLoss();
} catch (Exception e) {
e.printStackTrace();
}
Context context = App.getInstance();
if (result.length() == 0) {
ToastUtil.showLongToast(context, R.string.compile_failed);
} else if (result.length() >= 5 && "Error".equals(result.substring(0, 5))) {
ToastUtil.showLongToast(context, context.getString(R.string.compile_failed_with_info) + " " + result.substring(6));
} else {
ToastUtil.showLongToast(context, R.string.done);
}
} }
} }
} }