search

benjymous / MWM-for-Android

Meta Watch Manager Android SDK project for watch wrangling, remote protocol handling and notification routing for the Meta Watch wearable development systems. Includes an Intents based API for quick experiments.
www.metawatch.org
Apache License 2.0
59 stars 30 forks source link

gmail multi account & French translations update #57

Closed tschork closed 11 years ago

tschork commented 11 years ago

Monitor each Gmail accounts (and not only the first) for new mails

benjymous commented 11 years ago

Thanks :-)

Would it be possible to undo the formatting changes for the parts that you haven't modified? It pollutes the history otherwise, and makes it hard to keep track of what's actually changed if anything breaks further down the line. (Which, sadly is very common when Gmail is involved!)

Easiest way would be to back up your modified files, roll back, and just paste in the individual bits.

Also don't forget to add your translation changes to the GetTranslation site, so they won't get lost next time I import the strings.

tschork notifications@github.com wrote:

Monitor each Gmail accounts (and not only the first) for new mails

You can merge this Pull Request by running:

git pull https://github.com/tschork/MWM-for-Android master

Or you can view, comment on it, or merge it online at:

https://github.com/benjymous/MWM-for-Android/pull/57

-- Commit Summary --

  • Multi account handling in Gmail

-- File Changes --

M res/values-fr/strings.xml (500) M src/org/metawatch/manager/GmailAPIMonitor.java (302) M src/org/metawatch/manager/GmailLSMonitor.java (324) M src/org/metawatch/manager/IntentReceiver.java (377) M src/org/metawatch/manager/Utils.java (1083)

-- Patch Links --

https://github.com/benjymous/MWM-for-Android/pull/57.patch https://github.com/benjymous/MWM-for-Android/pull/57.diff

Reply to this email directly or view it on GitHub: https://github.com/benjymous/MWM-for-Android/pull/57

tschork commented 11 years ago

Yeah, that was why I was asking you about the formatter settings. I had eclipse setup to re-format the file on save, and as the project included formatting, I let it as is.

I will do this later, as well as re type the translations in getLocalization.com, as I have a long day waiting for me tomorrow.

benjymous commented 11 years ago

Yeah, turn off the auto format, and it should be good :-)

tschork commented 11 years ago

Git is really confusing to me. I'm so much more used to centralized rcs that I have problems understanding it's terminology. I can only diff my current state to the latest commit, Eclipse integration is simply non-existant, and I have to jungle between the ide, the github app and the github website. Is it me that complicate it or is it really that convoluted?

I have synced my machine with my repository, but everything is broken. It's been 2 hours, and I really need to get away of this screen. I'll give it a try again tomorrow evening.

benjymous commented 11 years ago

I've never got on with the Github client, and just stick with the command line git.

I believe there is a git integration for eclipse (there's nothing special about github, you can use any git client with it)

tschork commented 11 years ago

Ok, the code is ready. I don't know what I did at 2 am this morning, but now I have everything running correctly. Do you can see my last commit (the one labelled "Added missing init in Gmail plugin"), or should I do a new pull request?

I will include the changes back to the localizations later this evening, and I'll let you know when it's done. I have checked them on a HTC desire (which is my only other physical device) and an avd setup for mdpi (320x470).

tschork commented 11 years ago

There it is. I merged the strings in getLocalization too.

benjymous commented 11 years ago

Did you change anything in IntentReceiver.java or is that just autoformatting changes?

tschork commented 11 years ago

Sorry, it looks like I forgot to clean back that one. No, nothing was changed in there finally. When I was debugging, I did a unique mod that caused the file to be re-formatted.

Do you want me to revert the commit and fetch back the original file?

benjymous commented 11 years ago

Don't worry - I've manually merged your changes in (hopefully!) which should stop github mangling the history. Can you DM me on twitter with the email address you use on github, so I can attribute the changes to you?

tschork commented 11 years ago

Done. I will look after a problemI had with the backup/restore too yesterday. I did a backup before installing the compiled version, but could not restore it, the file was not found. I will look into that.

Would you mind if I look into your "todo" list and try to implement some of that stuff (auto start at boot should be trivial)?

benjymous commented 11 years ago

Right, should be merged in now - seems pretty exploitable that I can commit code under someone else's username, but it's nice that I can keep it attributed to you :)

Let me know if you spot anything I've missed.

The todo file in git is pretty ancient, and probably needs killing - the real todo is split over two places

some here: http://sprng.me/dng5g

and some here https://github.com/benjymous/MWM-for-Android/wiki/Braindump

It might be simpler for you, once you're sure I've not lost anything, to delete your fork and re-fork again, to clean up the formatting change commits.