tuckervento / Tinfoil-Twitter

For those users that require a Tinfoil Hat when logging in to Twitter. It creates a sandbox for Twitter's mobile site.
15 stars 6 forks source link

merge 1.7.5 of Tinfoil-Facebook #6

Closed richq closed 9 years ago

richq commented 9 years ago

Here's a PR for merging back in the upstream changes. You can't really see it too well on the github UI, it looks like an insane amount of changes. But if you add my repo as a remote and check it out locally with gitk it makes more sense - basically it is commit c2a35c3ab8599aece6b328d02f17d830f9cde379 for the conflict fixes.

For drawer_menu.xml I took upstreams file and just reimplemented the 4 tweaks TT had before.

The de-strings, I've tried my best but don't speak German so I don't know for sure if it is correct.

This bumps the version code too in build.gradle, which might be something you'd want to tweak yourself later.

At least if you don't take this PR it gives you an idea of the work involved to merge in TF again. It's pretty easy, just a dozen files with conflicts.

tuckervento commented 9 years ago

Thanks for doing this! I was just starting to look at doing this earlier this week, so I appreciate the help. I'll pull it down and give it a look over, hopefully we can get a new version rolled out this weekend.

richq commented 9 years ago

I removed the left-over docs, fb.com in the manifest, then the new commits remove the basic options and new perms. The actual code for the basic stuff would need to be cleaned up.

richq commented 9 years ago

Nice! I saw there was a new version out. Glad I could help out :-D