[Ssc-dev] Phase 1 app.
Hans-Christoph Steiner
hans at at.or.at
Thu Feb 3 13:06:55 EST 2011
On Sun, 2011-01-30 at 10:26 -0500, Shawn Van Every wrote:
> Hi Andrew,
>
> Thanks!
>
> Comments below:
>
> On Jan 29, 2011, at 11:35 PM, Andrew Senior wrote:
>
> > No problem. Thanks for the cleaned up github.
> > I just fixed some small bugs, so the exif wiper gets called and the face rect is correct.
>
> Great! Thanks!
>
> > (I now see the "toast" message but I don't see any effect on the exif data.
>
> Yes, this is the issue I had. I'll dig some more to see if I get to the bottom of it.
>
> > BTW I'm using this code to display the exif data on the phone
> > http://www.androiddevblog.net/android/reading-exif-information-from-a-picture-file-in-android )
>
> That seems to be the standard method on Android. Thanks for putting it in there.
>
> >
> > I pushed my edits back to github but in my dev branch.
> > Can someone confirm what I should do - I presume I should put the changes into my local master branch and then push, delete the dev branch and push that deletion?
>
>
> I think you can just push from your local master to the github repo. If you have a "feature" branch that you worked on instead of your local master, you could delete that but I don't think you need to push that deletion.
>
> Hans, does this seems accurate???
something like this:
git pull origin master (update to latest commits)
git checkout -b mybranch (create new branch 'mybranch' and switch to it)
git commit file.java -m "blah blah" (commit to your heart's content)
(now when the feature is all ready to push to the rest of us)
git rebase -i HEAD~3 (rebase into nice clean commits with good msgs)
git checkout master (switch to the 'master' branch)
git pull origin master (get new code from server)
git checkout mybranch (switch back to your feature branch)
git rebase master (include any new code in master into 'mybranch')
git checkout master (switch back to master)
git merge mybranch (merge in your nice, clean commits)
git push origin master (upload to the server)
git branch -d mybranch (delete merged feature branch)
This seems more complicated than it is. Most of the time, the rebasing
happens automatically. The only time you'll have to manually merge is
if multiple commits change the same spot in the code.
.hc
> >
> > I started looking into compressed domain modification.
> > http://en.wikipedia.org/wiki/JPEG is pretty thorough. I think it should be fairly easy to find the bits that encode a given macroblock and hope that then erasing them (and storing the data somewhere else- perhaps under an APP tag) shouldn't be too difficult.
>
> Cool. Looking forward to trying that out.
>
> >
> > I leave for a 2 week trip on Tuesday so I won't be able to make the meeting until 15th Feb.
>
> Have a great trip!
>
> >
> > Andrew
> >
> > On Sat, Jan 29, 2011 at 9:56 AM, Shawn Van Every <vanevery at walking-productions.com> wrote:
> > Hi Andrew,
> >
> > Sorry about these issues. Hans and I spent a bit of time cleaning up my (messy) initial checkin. We removed the files that were in bin and gen and I think that is causing the issue you are seeing.
> >
> > Perhaps it makes sense for you to reclone at this point rather than pull (unless you have code changes)?
> >
> > In the end, I don't know enough about git either so I am going to defer to Hans or someone else to see if they have any advice.
> >
> > Sorry again,
> > shawn
> >
> >
> > On Jan 28, 2011, at 11:08 PM, Andrew Senior wrote:
> >
> > > Great, thanks.
> > >
> > > When I pulled again, I had a couple more problems that I think are due to git setup.
> > > (My git/android is shaky enough that I don't want to be meddling by trying to fix what I think is a problem yet.)
> > >
> > > I got an error that "resource already exists : bin/.gitignore"
> > > deleting that file fixed the problem. I'm not sure why eclipse cares about it, but perhaps it shouldn't be in the repository?
> > >
> > > Git also seems to have these files, which I suspect are all generated, so shouldn't be in the repository. I had to
> > > git checkout -- each of them before I could pull
> > > M bin/SSC Phase 1.apk
> > > M bin/classes.dex
> > > M bin/resources.ap_
> > >
> > > Andrew
> > >
> > > On Fri, Jan 28, 2011 at 11:03 AM, Shawn Van Every <vanevery at walking-productions.com> wrote:
> > > Hi All,
> > >
> > > Just letting you all know that with Hans' help, I think I have fixed up the GitHub repo. All of the files should be up to date with latest code and should run more or less correctly.
> > >
> > > Thanks,
> > > shawn
> > >
> > > On Jan 28, 2011, at 10:42 AM, Shawn Van Every wrote:
> > >
> > > > Hi Andrew,
> > > >
> > > > Thanks for checking it out.
> > > >
> > > > I am sorry for the issues with the files being at different versions. Seems I am not using git quite right. I'll correct that asap and you should be able to checkout a version that will run the EXIFWiper class on an existing image.
> > > >
> > > > I agree that we may not need to remove everything. I just put a list on the wiki, perhaps we can take a pass at what should stay and what should go.
> > > > https://github.com/guardianproject/SecureSmartCam/wiki/Metadata-wiping
> > > >
> > > > Talk to you soon,
> > > > shawn
> > > >
> > > > On Jan 27, 2011, at 11:28 PM, Andrew Senior wrote:
> > > >
> > > >> Hi Shawn,
> > > >>
> > > >> I just got the latest code and was trying the app. It's great. Lots of function already in it.
> > > >> My android coding is very rusty so I haven't got far with investigating and thought I'd ask some questions....
> > > >>
> > > >> The EraseMetaData button wasn't in the checked in version's main.xml, and while I managed to make one, I don't think I figured out how to hook it up- I don't get a "toast" message when I press it, and the metadata didn't seem to be erased. In pictures taken with the tool, most of the metadata wasn't there- I was wondering if that was because it wasn't never in there, or because you had to erase it? I don't see a call to erase the metadata.
> > > >>
> > > >> I was wondering if using Exif tags not defined in the android docs works- I tried
> > > >> ei.setAttribute("ImageDescription","Something New");
> > > >> ei.setAttribute("UserComment","No Comment");
> > > >> getting tag names from exiftool but I don't think I'm actually executing the code yet.
> > > >>
> > > >> I guess we don't need to erase all of the fields - flash, image dimensions, orientation, white balance can stay in.
> > > >>
> > > >> Perhaps for date we need some options for putting in plausible but false data. Maybe just empty or user-edited are all that are practical, but we could offer something like "start at this date/time and increment by a random amount around 60 seconds each photograph" for continuous shooting or batch editing.
> > > >>
> > > >> I think this was the article I'd found before that mentioned adding to the gallery menu item.
> > > >> http://stackoverflow.com/questions/1215817/how-to-add-share-menu-item-to-gallery-by-code
> > > >>
> > > >> Andrew
> > > >> _______________________________________________
> > > >> Ssc-dev mailing list
> > > >>
> > > >> Post: Ssc-dev at lists.mayfirst.org
> > > >> List info: https://lists.mayfirst.org/mailman/listinfo/ssc-dev
> > > >>
> > > >> To Unsubscribe
> > > >> Send email to: Ssc-dev-unsubscribe at lists.mayfirst.org
> > > >> Or visit: https://lists.mayfirst.org/mailman/options/ssc-dev/vanevery%40walking-productions.com
> > > >>
> > > >> You are subscribed as: vanevery at walking-productions.com
> > > >
> > > >
> > > >
> > > > _______________________________________________
> > > > Ssc-dev mailing list
> > > >
> > > > Post: Ssc-dev at lists.mayfirst.org
> > > > List info: https://lists.mayfirst.org/mailman/listinfo/ssc-dev
> > > >
> > > > To Unsubscribe
> > > > Send email to: Ssc-dev-unsubscribe at lists.mayfirst.org
> > > > Or visit: https://lists.mayfirst.org/mailman/options/ssc-dev/vanevery%40walking-productions.com
> > > >
> > > > You are subscribed as: vanevery at walking-productions.com
> > >
> > > Shawn Van Every
> > > vanevery at walking-productions.com
> > > Mobile and Streaming Consulting
> > > http://www.walking-productions.com/notslop
> > >
> > > _______________________________________________
> > > Ssc-dev mailing list
> > >
> > > Post: Ssc-dev at lists.mayfirst.org
> > > List info: https://lists.mayfirst.org/mailman/listinfo/ssc-dev
> > >
> > > To Unsubscribe
> > > Send email to: Ssc-dev-unsubscribe at lists.mayfirst.org
> > > Or visit: https://lists.mayfirst.org/mailman/options/ssc-dev/aws%40andrewsenior.com
> > >
> > > You are subscribed as: aws at andrewsenior.com
> > >
> >
> > Shawn Van Every
> > vanevery at walking-productions.com
> > Mobile and Streaming Consulting
> > http://www.walking-productions.com/notslop
> >
> >
>
> Shawn Van Every
> vanevery at walking-productions.com
> Mobile and Streaming Consulting
> http://www.walking-productions.com/notslop
>
> _______________________________________________
> Ssc-dev mailing list
>
> Post: Ssc-dev at lists.mayfirst.org
> List info: https://lists.mayfirst.org/mailman/listinfo/ssc-dev
>
> To Unsubscribe
> Send email to: Ssc-dev-unsubscribe at lists.mayfirst.org
> Or visit: https://lists.mayfirst.org/mailman/options/ssc-dev/hans%40at.or.at
>
> You are subscribed as: hans at at.or.at
More information about the Ssc-dev
mailing list