Navigation Menu

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 Omni fork #40

Closed
pluscubed opened this issue Sep 15, 2018 · 7 comments
Closed

Merge Omni fork #40

pluscubed opened this issue Sep 15, 2018 · 7 comments

Comments

@pluscubed
Copy link
Owner

@maxwen @nathanchance @cooldroid @Unpublished

I was completely unaware of this fork, and I'm flattered that MatLog would be included in OmniROM! I'll merge the improvements from the Omni fork if that is OK with you guys? I'm hoping to make a new release by the end of the month, on both Google Play and F-Droid.

https://github.com/omnirom/android_packages_apps_Matlog
https://github.com/cooldroid/matlog

@pluscubed
Copy link
Owner Author

I've started on this in the omni branch.

@Unpublished
Copy link
Collaborator

I would be in favor of splitting my changes to another PR/Branch as some of the commits are outdated (the refactor) or don't apply anymore because of your latest changes.
https://github.com/Unpublished/matlog/tree/dev_clean is rebased on current master.

@pluscubed
Copy link
Owner Author

@Unpublished It's somewhat difficult to pick apart the changes due to me preemptively resolving the merge conflicts... 😬

I'll make sure to do separate branch/PRs in the future, and keep these changes this time if that's OK with you? I think most of them still merge OK with the omni branch

@Unpublished
Copy link
Collaborator

I noticed that as well while I tried to rebase the omni branch. I'm OK with keeping it as is this time.

Will open a PR with the follow up changes then.

https://github.com/plusCubed/matlog/compare/omni#diff-c8cc2dd42271f2bf39c6aa81eb6a5529L8
I think we need to keep superuser permission outside of OmniROM, don't we?

@pluscubed
Copy link
Owner Author

I think the superuser permission has been deprecated with SuperSU and Magisk, so I've removed it like the OmniROM fork.

@Unpublished
Copy link
Collaborator

Wasn't aware of that then I agree with removing it.

@pluscubed
Copy link
Owner Author

Merged. I need to do some more testing to make sure I didn't break anything.

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

No branches or pull requests

2 participants