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.

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

Merge dev into sensitivity-test #102

Merged
merged 2 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/src/main/java/xtr/keymapper/Server.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ private static void writeScript(StringBuffer linesToWrite, File scriptFile) thro
fileWriter.write(linesToWrite.toString());
}
} else {
if (linesToWrite.toString().equals(target.toString()))
if (!linesToWrite.toString().equals(target.toString()))
fileWriter.write(linesToWrite.toString());
}
fileWriter.close();
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/xtr/keymapper/activity/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,11 @@ public void startPointer(){
setButtonState(false);
requestNotificationPermission();
}
if (!RemoteServiceHelper.isRootService)
if (RemoteServiceHelper.useShizuku) {
if (!Shizuku.pingBinder()) alertShizukuNotAuthorized();
} else if (!RemoteServiceHelper.isRootService) {
alertRootAccessAndExit();
}
}

private void setButtonState(boolean start) {
Expand Down