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

Whitelist fix #38

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Whitelist fix #38

wants to merge 13 commits into from

Conversation

Almoped
Copy link

@Almoped Almoped commented Aug 28, 2016

Tries to avoid shell commands getting ahead of each other. Could probably keep things async and reload whitelist upon completion. Small logic and object reuse change. Seems to work.

wifi timeout, more verbose debug, delay in seconds, always run enterDoze() even if device seems to be idle, wl releases
add timout checkbox, could move strings to values
Sometimes the mobile data checkbox woudl be disabled even when root was available, this makes the option always available.
ProcessPhoenix is no longer used on reset as it could make the app/service crash.

However crashing the app/service is what can fix the mobile data checkbox being wrongly removed.
enable mobile data checkbox and fix crash
if async, SH in loadPackagesFromWhitelist() could be run before list is updated
@theblixguy
Copy link
Owner

I was about to merge this but noticed some conflicts. Would you mind resolving the issues with this commit (and the previous ones) and re-test it to make sure it works fine. After that I will merge this and push an update to Play Store.

@theblixguy
Copy link
Owner

The commits needs some fixing as it seems that this whitelist fix PR includes other unrelated commits. This is same for other PRs that you have submitted.

@Almoped
Copy link
Author

Almoped commented Feb 26, 2017

It seemed to be minor conflicts which I have resolved to the best of my ability. But as I've said, I am new to GIT and they were funky cumulative patches, each new one including all the previous. I wouldn't mind testing it, but I really have no idea how to fetch the files resulting from the resolved conflicts.

All said, I see no reason why it should not work. Perhaps a tempWakeLock.release() got in a little to early in one of the enterDoze() methods. It seems to me these should be placed as late as possible.

@theblixguy
Copy link
Owner

theblixguy commented Feb 26, 2017

You can follow the steps here to create a new PR with only specific commits, you should do that with other PRs as well: http://blog.asquareb.com/blog/2014/06/19/making-a-git-pull-request-for-specific-commits/

You can also create a new branch for each PR, and send a PR for each branch, containing the respective commits.

There's plenty of information available on the internet on how to create PRs properly. I can cherry-pick the commits myself in each of these PRs, but it would be better to have a PR which is properly set up in the first place.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants