[Ssc-dev] [guardianproject/SecureSmartCam] 7c296e: we now have bundled-up JSON data embedded into the...

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/guardianproject/SecureSmartCam

Commit: 7c296e4a0ccc07f6eaad55b036ae9bb6be25a378
    https://github.com/guardianproject/SecureSmartCam/commit/7c296e4a0ccc07f6eaad55b036ae9bb6be25a378
Author: LvH <LvH at VIDEOCLASH-2.local>
Date:   2011-04-22 (Fri, 22 Apr 2011)

Changed paths:
  M src/org/witness/sscphase1/ImageEditor.java
  M src/org/witness/sscphase1/SSCMetadataHandler.java

Log Message:
-----------
we now have bundled-up JSON data embedded into the EXIF TAG_MAKE tag on the saved image.  (See logcat for complete dumpout of JSON string on save.)


Commit: 07cccdf0a69920e99d7ea7aed237709bf2ef8cde
    https://github.com/guardianproject/SecureSmartCam/commit/07cccdf0a69920e99d7ea7aed237709bf2ef8cde
Author: LvH <LvH at VIDEOCLASH-2.local>
Date:   2011-04-22 (Fri, 22 Apr 2011)

Changed paths:
  M AndroidManifest.xml
  A res/drawable/ic_launcher_ssc.png
  A res/drawable/ic_ssc.png
  M res/layout/imageregioninner.xml
  M res/layout/mainmenu.xml
  M res/values/arrays.xml
  M res/values/strings.xml
  M src/org/witness/sscphase1/BlurObscure.java
  M src/org/witness/sscphase1/CameraObscuraMainMenu.java
  M src/org/witness/sscphase1/ImageEditor.java
  M src/org/witness/sscphase1/ImageRegion.java
  M src/org/witness/sscphase1/secure/Apg.java
  M src/org/witness/sscphase1/secure/CryptoProvider.java

Log Message:
-----------
Merge branch 'master' of github.com:guardianproject/SecureSmartCam

Conflicts:
	src/org/witness/sscphase1/ImageEditor.java


Compare: https://github.com/guardianproject/SecureSmartCam/compare/e4602ad...07cccdf