search

bepass-org / oblivion

Unofficial warp client for android
2.96k stars 420 forks source link

Bypass list feature #60

Closed ameerhossein closed 3 months ago

ameerhossein commented 3 months ago

59

I rebased the previous PR onto my own outdated main branch accidentally and caused even more conflicts. I believe this new PR is fine and can be merged correctly.

markpash commented 3 months ago

The Use OblivionVpnService static methods... commit is already merged I think, or maybe I'm reading it wrong.

markpash commented 3 months ago

I think you deleted the wrong commit :P I've enabled the button in github that suggests that to update the branch. Choose the "Update with rebase" option. Hopefully it helps.

ameerhossein commented 3 months ago

I think you deleted the wrong commit :P

I used the update branch button but it defaulted to merge so I had to drop it.

markpash commented 3 months ago

I think you deleted the wrong commit :P

I used the update branch button but it defaulted to merge so I had to drop it.

I as the maintainer get permissions to push to your PR branch, so I can fix some of this for you right now. Let me know if you're ok with that.

ameerhossein commented 3 months ago

Squashed the font commit you mentioned.

The Use OblivionVpnService static methods... commit is already merged I think, or maybe I'm reading it wrong.

It's a different commit. Actually it should have been committed with the previous PR. Don't know why did it end up here. probably my mistake.

I as the maintainer get permissions to push to your PR branch, so I can fix some of this for you right now. Let me know if you're ok with that.

I squashed the commit related to your suggestions. I believe you already have permission to edit the PR if you want to change anything.

ameerhossein commented 3 months ago

Don't merge it yet. Android manifest needs an update again after the rebase

ameerhossein commented 3 months ago

Ok I squashed the android manifest commit too. Everything seems ok now in my tests.