[Ssc-dev] [guardianproject/SecureSmartCam] 5a7743: Cleanup, added id to ImageView

GitHub noreply at github.com
Fri Aug 30 18:22:13 EDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/guardianproject/SecureSmartCam
  Commit: 5a77431ce38a463a9a160419af6d6c9a9a52a210
      https://github.com/guardianproject/SecureSmartCam/commit/5a77431ce38a463a9a160419af6d6c9a9a52a210
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M res/layout/splashscreen.xml

  Log Message:
  -----------
  Cleanup, added id to ImageView


  Commit: e04a97aecdf43611fc5523cd659eeb727af6e971
      https://github.com/guardianproject/SecureSmartCam/commit/e04a97aecdf43611fc5523cd659eeb727af6e971
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M src/org/witness/sscphase1/SplashScreenActivity.java

  Log Message:
  -----------
  Cleanup, made ImageView cliackable


  Commit: bdf3d4e1043c99904993f093eac4fca918215cf5
      https://github.com/guardianproject/SecureSmartCam/commit/bdf3d4e1043c99904993f093eac4fca918215cf5
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  cleanup, removing features not being used for this release


  Commit: dd95fa1469a9819b525de135cf6bfc9bbae609c5
      https://github.com/guardianproject/SecureSmartCam/commit/dd95fa1469a9819b525de135cf6bfc9bbae609c5
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-23 (Mon, 23 May 2011)

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

  Log Message:
  -----------
  Cleanup, removing features, preparing for release


  Commit: 9b3434c84a1a12b3c7ba294e885251614812e7ac
      https://github.com/guardianproject/SecureSmartCam/commit/9b3434c84a1a12b3c7ba294e885251614812e7ac
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  Cleanup, removing features, preparing for release


  Commit: 48f8a688cd49467e84353532ad4087665fdaaac5
      https://github.com/guardianproject/SecureSmartCam/commit/48f8a688cd49467e84353532ad4087665fdaaac5
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    M res/layout/splashscreen.xml

  Log Message:
  -----------
  formatting


  Commit: ea1ae7590333d35e780e2bc3d97bd24ffa1618ab
      https://github.com/guardianproject/SecureSmartCam/commit/ea1ae7590333d35e780e2bc3d97bd24ffa1618ab
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    M res/menu/image_editor_menu.xml

  Log Message:
  -----------
  Changed menu items for release version


  Commit: d6c26b6a09d9aafc745c1f2fe815ecdd7ecc7fe8
      https://github.com/guardianproject/SecureSmartCam/commit/d6c26b6a09d9aafc745c1f2fe815ecdd7ecc7fe8
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    M res/values/strings.xml

  Log Message:
  -----------
  Added strings for new menu items


  Commit: c9bbbff16fe3e58284d08af2c6d861065cbeb63b
      https://github.com/guardianproject/SecureSmartCam/commit/c9bbbff16fe3e58284d08af2c6d861065cbeb63b
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    M src/org/witness/sscphase1/AnonObscure.java

  Log Message:
  -----------
  Formatting


  Commit: 40c8180fc855fb24daf549f98b65ba2781e9321d
      https://github.com/guardianproject/SecureSmartCam/commit/40c8180fc855fb24daf549f98b65ba2781e9321d
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    M src/org/witness/sscphase1/BlurObscure.java

  Log Message:
  -----------
  Formatting


  Commit: 79bb99106be05d0edff031e10c85de5953e6d241
      https://github.com/guardianproject/SecureSmartCam/commit/79bb99106be05d0edff031e10c85de5953e6d241
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    M src/org/witness/sscphase1/ObscureMethod.java

  Log Message:
  -----------
  Formatting


  Commit: 1713f8d06a07357536746347528f7eb8b5cb4e55
      https://github.com/guardianproject/SecureSmartCam/commit/1713f8d06a07357536746347528f7eb8b5cb4e55
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    M src/org/witness/sscphase1/PaintSquareObscure.java

  Log Message:
  -----------
  Formatting


  Commit: ac280dbb96c6f69aa8ec225d941748761988e180
      https://github.com/guardianproject/SecureSmartCam/commit/ac280dbb96c6f69aa8ec225d941748761988e180
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    M src/org/witness/sscphase1/PixelizeObscure.java

  Log Message:
  -----------
  Formatting


  Commit: 7d632fa0d2f2a47fe202d412aa168b45fc8f8e13
      https://github.com/guardianproject/SecureSmartCam/commit/7d632fa0d2f2a47fe202d412aa168b45fc8f8e13
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  Commenting, Formatting, added Camera taken pictures to Gallery


  Commit: 7651986ca14d7b4099e59a1de4fbf7816e87424e
      https://github.com/guardianproject/SecureSmartCam/commit/7651986ca14d7b4099e59a1de4fbf7816e87424e
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

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

  Log Message:
  -----------
  Commenting, Formatting, removing features not for release, minor bug fixes


  Commit: 7bee5c1467df792a4998e945ca059e2a6f9c271d
      https://github.com/guardianproject/SecureSmartCam/commit/7bee5c1467df792a4998e945ca059e2a6f9c271d
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  Commenting, Formatting, added constants for ObscureMethods


  Commit: 4706b997cda8390e74b49e6a67354a17facd9ad7
      https://github.com/guardianproject/SecureSmartCam/commit/4706b997cda8390e74b49e6a67354a17facd9ad7
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

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

  Log Message:
  -----------
  Finished commenting, removed overlay bitmap/canvas as it isn't required any longer, disabled realtime preview for now


  Commit: 3f331bc8f4fe9bfa299ea1acfe594ae9445df5da
      https://github.com/guardianproject/SecureSmartCam/commit/3f331bc8f4fe9bfa299ea1acfe594ae9445df5da
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  Started cleanup and commenting of code, needs more work


  Commit: 94c7ba20a0d86b35833ddcd52e2c70516fc15777
      https://github.com/guardianproject/SecureSmartCam/commit/94c7ba20a0d86b35833ddcd52e2c70516fc15777
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-03 (Fri, 03 Jun 2011)

  Changed paths:
    R assets/camera_obscura.db
    R src/org/witness/sscphase1/CameraObscura.java
    R src/org/witness/sscphase1/EXIFWiper.java
    R src/org/witness/sscphase1/IdTagger.java
    R src/org/witness/sscphase1/PreferencesActivity.java
    R src/org/witness/sscphase1/SSCCalculator.java
    R src/org/witness/sscphase1/SSCImagePrefs.java
    R src/org/witness/sscphase1/SSCMetadataHandler.java
    R src/org/witness/sscphase1/SSCSensorSucker.java
    R src/org/witness/sscphase1/SSCTagContainer.java
    R src/org/witness/sscphase1/secure/Apg.java
    R src/org/witness/sscphase1/secure/CryptoProvider.java
    R src/org/witness/sscphase1/secure/EncryptObscureMethod.java
    R src/org/witness/sscphase1/secure/EncryptTagger.java
    R src/org/witness/sscphase1/secure/GPGExportActivity.java
    R src/org/witness/sscphase1/secure/MediaHasher.java

  Log Message:
  -----------
  deleted unused source and assets for this release


  Commit: 741f81fc06956da280c5960fac5e90362b75d62c
      https://github.com/guardianproject/SecureSmartCam/commit/741f81fc06956da280c5960fac5e90362b75d62c
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-03 (Fri, 03 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/AnonObscure.java

  Log Message:
  -----------
  Formatting


  Commit: b1c3d349b95e04bd063464607befc3cca9dce641
      https://github.com/guardianproject/SecureSmartCam/commit/b1c3d349b95e04bd063464607befc3cca9dce641
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-03 (Fri, 03 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/BlurObscure.java

  Log Message:
  -----------
  Formatting


  Commit: e3a7dfa1635cf37b80b321a32fddc53ed5fc8c02
      https://github.com/guardianproject/SecureSmartCam/commit/e3a7dfa1635cf37b80b321a32fddc53ed5fc8c02
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-03 (Fri, 03 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  Formatting


  Commit: 45bc3e00fc69aa0f3d263c96bfff8c7545654275
      https://github.com/guardianproject/SecureSmartCam/commit/45bc3e00fc69aa0f3d263c96bfff8c7545654275
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-03 (Fri, 03 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  Finally fixed bug with resizing and moving regions


  Commit: 7825d9a1431afea59d744f0e718c5938fa02d7ed
      https://github.com/guardianproject/SecureSmartCam/commit/7825d9a1431afea59d744f0e718c5938fa02d7ed
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-03 (Fri, 03 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ObscureMethod.java

  Log Message:
  -----------
  Formatting


  Commit: e564677dcebfdcac30658ea394b072afb51f4412
      https://github.com/guardianproject/SecureSmartCam/commit/e564677dcebfdcac30658ea394b072afb51f4412
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-03 (Fri, 03 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/PixelizeObscure.java

  Log Message:
  -----------
  Formatting


  Commit: 2caf620ab2a05ade15b9c91cbe859909aab04cff
      https://github.com/guardianproject/SecureSmartCam/commit/2caf620ab2a05ade15b9c91cbe859909aab04cff
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-05 (Sun, 05 Jun 2011)

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

  Log Message:
  -----------
  Fixed ImageRegion movement on pan/zoom operations


  Commit: dba4bd23bd65c07016ed726c0f53379686f6a2ab
      https://github.com/guardianproject/SecureSmartCam/commit/dba4bd23bd65c07016ed726c0f53379686f6a2ab
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-05 (Sun, 05 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  Fixed ImageRegion movement on pan/zoom operations


  Commit: 977c0fc54129b36a228e3437c995f0e8072a8d28
      https://github.com/guardianproject/SecureSmartCam/commit/977c0fc54129b36a228e3437c995f0e8072a8d28
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-05 (Sun, 05 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ObscureMethod.java

  Log Message:
  -----------
  Cleanup


  Commit: 89bb6d13cf63c6581313ce33c62db7abc267aa10
      https://github.com/guardianproject/SecureSmartCam/commit/89bb6d13cf63c6581313ce33c62db7abc267aa10
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-05 (Sun, 05 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  Choosing Edit, disables edit on other regions


  Commit: e2141e52f1528091f4b7490bc385824b460ad21a
      https://github.com/guardianproject/SecureSmartCam/commit/e2141e52f1528091f4b7490bc385824b460ad21a
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-05 (Sun, 05 Jun 2011)

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

  Log Message:
  -----------
  Choosing Edit, disables edit on other regions


  Commit: f169e97190bc852c9a169d4fdcfc846ce22bb563
      https://github.com/guardianproject/SecureSmartCam/commit/f169e97190bc852c9a169d4fdcfc846ce22bb563
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  Added choices for all existing obscure methods


  Commit: 533fa9f23f65dd3ea545d994d83bc3eb67468234
      https://github.com/guardianproject/SecureSmartCam/commit/533fa9f23f65dd3ea545d994d83bc3eb67468234
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  Cleaned up, removed unused permissions, services and activities


  Commit: 7a1fdbbf43f634ef4a008aa9f73725d382dba72d
      https://github.com/guardianproject/SecureSmartCam/commit/7a1fdbbf43f634ef4a008aa9f73725d382dba72d
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/BlurObscure.java

  Log Message:
  -----------
  Fixed issue with accessing pixels outside of image


  Commit: 3f27d87cef46f1ff3b33a6050f4fda1a2ed47d86
      https://github.com/guardianproject/SecureSmartCam/commit/3f27d87cef46f1ff3b33a6050f4fda1a2ed47d86
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

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

  Log Message:
  -----------
  Fixed save location for temporary files for sharing


  Commit: 8f8a8e3306f88b8df870f335a4f338a6b862e97d
      https://github.com/guardianproject/SecureSmartCam/commit/8f8a8e3306f88b8df870f335a4f338a6b862e97d
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ObscureMethod.java

  Log Message:
  -----------
  Cleanup


  Commit: adfb3fd3dba77b8ca44e576e4e4ccf5cf9319fda
      https://github.com/guardianproject/SecureSmartCam/commit/adfb3fd3dba77b8ca44e576e4e4ccf5cf9319fda
  Author: Derek Halliday <halliday at gmail.com>
  Date:   2011-06-07 (Tue, 07 Jun 2011)

  Changed paths:
    A res/drawable-hdpi/ic_menu_about.png
    A res/drawable-hdpi/ic_menu_trash.png
    M res/menu/image_editor_menu.xml

  Log Message:
  -----------
  added remaining menu icons


  Commit: eef4716e7e9127ef9ff08a8697cecb792afa2311
      https://github.com/guardianproject/SecureSmartCam/commit/eef4716e7e9127ef9ff08a8697cecb792afa2311
  Author: Hans-Christoph Steiner <hans at eds.org>
  Date:   2011-06-07 (Tue, 07 Jun 2011)

  Changed paths:
    A update-ant-build.sh

  Log Message:
  -----------
  added script to generate ant build for Jenkins builds


  Commit: 6952fe9da6177b7c91af84168f31543caf3b8976
      https://github.com/guardianproject/SecureSmartCam/commit/6952fe9da6177b7c91af84168f31543caf3b8976
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-07 (Tue, 07 Jun 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  Handling orientation changes ourselves


  Commit: 00499ce564a831a4e90059abaab9b831a542f08d
      https://github.com/guardianproject/SecureSmartCam/commit/00499ce564a831a4e90059abaab9b831a542f08d
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-07 (Tue, 07 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  Handling orientation changes ourselves


  Commit: a34c351fccac91e61b51ad8d40fb76a48b5c2983
      https://github.com/guardianproject/SecureSmartCam/commit/a34c351fccac91e61b51ad8d40fb76a48b5c2983
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-07 (Tue, 07 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/SplashScreenActivity.java

  Log Message:
  -----------
  Handling orientation changes ourselves


  Commit: 8f40d4735440cba5381ba46595f3f66c0e9dd973
      https://github.com/guardianproject/SecureSmartCam/commit/8f40d4735440cba5381ba46595f3f66c0e9dd973
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-07 (Tue, 07 Jun 2011)

  Changed paths:
    A update-ant-build.sh

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


  Commit: 8730ed89110631786f887e302d7f3276a2f91acf
      https://github.com/guardianproject/SecureSmartCam/commit/8730ed89110631786f887e302d7f3276a2f91acf
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-07 (Tue, 07 Jun 2011)

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

  Log Message:
  -----------
  Handling orientation changes ourselves and deselecting regions when touching elsewhere


  Commit: d24671dbbdcfd2061397d6061c8eb747197d6ba0
      https://github.com/guardianproject/SecureSmartCam/commit/d24671dbbdcfd2061397d6061c8eb747197d6ba0
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-07 (Tue, 07 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  Handling orientation changes ourselves and deselecting regions when touching elsewhere


  Commit: 8de7657b9aa85b88e4582c8d9bcf77b78ab7f93c
      https://github.com/guardianproject/SecureSmartCam/commit/8de7657b9aa85b88e4582c8d9bcf77b78ab7f93c
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    A res/layout/imagepreview.xml

  Log Message:
  -----------
  Adding preview capabilities


  Commit: d180ea07d87aaf1d4bc1596f1e117934e29aa8f7
      https://github.com/guardianproject/SecureSmartCam/commit/d180ea07d87aaf1d4bc1596f1e117934e29aa8f7
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    A src/org/witness/sscphase1/ImagePreview.java

  Log Message:
  -----------
  Addming preview capabilities


  Commit: 7ad9d714ddfb0894c9a97cf7a082c6280f71c979
      https://github.com/guardianproject/SecureSmartCam/commit/7ad9d714ddfb0894c9a97cf7a082c6280f71c979
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  Adding preview capabilities


  Commit: 4099855c0449af865fea59c6b9e1988949e580b8
      https://github.com/guardianproject/SecureSmartCam/commit/4099855c0449af865fea59c6b9e1988949e580b8
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M res/menu/image_editor_menu.xml

  Log Message:
  -----------
  Added preview menu item


  Commit: 00fa5adf54c2afc4108c07eee676802b24ae8957
      https://github.com/guardianproject/SecureSmartCam/commit/00fa5adf54c2afc4108c07eee676802b24ae8957
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M res/values/strings.xml

  Log Message:
  -----------
  Added preview menu item text


  Commit: ab8a1f3a737c5d0c4623d5c7d0d5d6e2b1635c29
      https://github.com/guardianproject/SecureSmartCam/commit/ab8a1f3a737c5d0c4623d5c7d0d5d6e2b1635c29
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

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

  Log Message:
  -----------
  Added preview capabilities


  Commit: 58dec1baaa66fd4050d9b67f9d87aa527e3e34b6
      https://github.com/guardianproject/SecureSmartCam/commit/58dec1baaa66fd4050d9b67f9d87aa527e3e34b6
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

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

  Log Message:
  -----------
  Added 'About' intent


  Commit: 4f1514da1fdad6e1b094e60538e74a7bcbf6af4f
      https://github.com/guardianproject/SecureSmartCam/commit/4f1514da1fdad6e1b094e60538e74a7bcbf6af4f
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M LICENSE

  Log Message:
  -----------
  updated to gplv3


  Commit: 11242a89aceffc177b5f9d334648d7a09c1dbca0
      https://github.com/guardianproject/SecureSmartCam/commit/11242a89aceffc177b5f9d334648d7a09c1dbca0
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M README

  Log Message:
  -----------
  added notes about QuickAction


  Commit: 2f6237adffda466137e4bbe6dfcf56ebd0c5f4c2
      https://github.com/guardianproject/SecureSmartCam/commit/2f6237adffda466137e4bbe6dfcf56ebd0c5f4c2
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M AndroidManifest.xml
    A res/drawable-hdpi/ic_menu_about.png
    A res/drawable-hdpi/ic_menu_trash.png
    A res/layout/imagepreview.xml
    M res/menu/image_editor_menu.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
    A src/org/witness/sscphase1/ImagePreview.java
    M src/org/witness/sscphase1/ImageRegion.java
    M src/org/witness/sscphase1/ObscureMethod.java
    M src/org/witness/sscphase1/SplashScreenActivity.java
    A update-ant-build.sh

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


  Commit: a9c0a253023219f9202a5a752b6b6a9bf3251ef2
      https://github.com/guardianproject/SecureSmartCam/commit/a9c0a253023219f9202a5a752b6b6a9bf3251ef2
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    A CHANGELOG

  Log Message:
  -----------
  new file


  Commit: f56b29882ea951bb3796a21ac6b39809b0338d1b
      https://github.com/guardianproject/SecureSmartCam/commit/f56b29882ea951bb3796a21ac6b39809b0338d1b
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M res/layout/imageviewer.xml

  Log Message:
  -----------
  Cleanup


  Commit: e8b5c2ae76c9b6a2afe2e347c74b3c28115263fa
      https://github.com/guardianproject/SecureSmartCam/commit/e8b5c2ae76c9b6a2afe2e347c74b3c28115263fa
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  Added About Menu


  Commit: 47f2c84148b1f740e6bb515a480dc3601637d76a
      https://github.com/guardianproject/SecureSmartCam/commit/47f2c84148b1f740e6bb515a480dc3601637d76a
  Author: Derek Halliday <halliday at gmail.com>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M AndroidManifest.xml
    A res/drawable-hdpi/ic_menu_preview.png
    A res/drawable/ic_context_blur.png
    A res/drawable/ic_context_delete.png
    R res/drawable/ic_context_destroy.png
    A res/drawable/ic_context_fill.png
    A res/drawable/ic_context_mask.png
    A res/drawable/ic_context_pixelate.png
    M res/menu/image_editor_menu.xml
    M res/values/strings.xml
    M src/org/witness/sscphase1/ImageEditor.java
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  updated context menu, image edit menu, image preview screen


  Commit: 44d6926647e86149ec00ab1c51dc8e7a8581b816
      https://github.com/guardianproject/SecureSmartCam/commit/44d6926647e86149ec00ab1c51dc8e7a8581b816
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M res/drawable/ic_context_fill.png
    M src/org/witness/sscphase1/PaintSquareObscure.java

  Log Message:
  -----------
  modified fill to be black


  Commit: bc5a93900a58168a5d5dfd6b8f1d5d7aa962355c
      https://github.com/guardianproject/SecureSmartCam/commit/bc5a93900a58168a5d5dfd6b8f1d5d7aa962355c
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M res/menu/image_editor_menu.xml
    M src/org/witness/sscphase1/ImageEditor.java
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  added back in real-time preview and transparent regions


  Commit: 986a989ff9700aeb79a44cb0c788d764b96073e1
      https://github.com/guardianproject/SecureSmartCam/commit/986a989ff9700aeb79a44cb0c788d764b96073e1
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

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

  Log Message:
  -----------
  reduced number of places where preview paint code is called


  Commit: aa4f2224687fc9ddc6988a7ee15db4c8db862273
      https://github.com/guardianproject/SecureSmartCam/commit/aa4f2224687fc9ddc6988a7ee15db4c8db862273
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-09 (Thu, 09 Jun 2011)

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

  Log Message:
  -----------
  Better scaling of initial image and attempting to center immediately


  Commit: 51e4803c755f5f1afd6fd04d7d625aa84c5b59ae
      https://github.com/guardianproject/SecureSmartCam/commit/51e4803c755f5f1afd6fd04d7d625aa84c5b59ae
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  made the non-edit mode a light white box


  Commit: 12c1e5a9b02b484b24a90359233121270327666a
      https://github.com/guardianproject/SecureSmartCam/commit/12c1e5a9b02b484b24a90359233121270327666a
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M AndroidManifest.xml
    M res/values/strings.xml

  Log Message:
  -----------
  updated name and version info


  Commit: bbe9ec5d8a335acca02108678f278a65620399f6
      https://github.com/guardianproject/SecureSmartCam/commit/bbe9ec5d8a335acca02108678f278a65620399f6
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

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

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


  Commit: ee21ea6fdc2e4b01bbfb970cf3cdec530ad88cf2
      https://github.com/guardianproject/SecureSmartCam/commit/ee21ea6fdc2e4b01bbfb970cf3cdec530ad88cf2
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updating version for market update


  Commit: 49b62aad43773d9e9cb223a80e41788c850abc8d
      https://github.com/guardianproject/SecureSmartCam/commit/49b62aad43773d9e9cb223a80e41788c850abc8d
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M assets/anon.png
    M res/drawable/ic_context_mask.png
    M res/values/strings.xml

  Log Message:
  -----------
  modifying icon label and mask image


  Commit: 45c3d44ceccbd08a4db7330e638536e8414088dd
      https://github.com/guardianproject/SecureSmartCam/commit/45c3d44ceccbd08a4db7330e638536e8414088dd
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  fixed layout handling and NPE


  Commit: cce2996cf59d9bbd0351125062fd7f65fba3bbd0
      https://github.com/guardianproject/SecureSmartCam/commit/cce2996cf59d9bbd0351125062fd7f65fba3bbd0
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    R lib/google-gson-1.7.1-release.zip
    R lib/google-gson-1.7.1/LICENSE
    R lib/google-gson-1.7.1/README
    R lib/google-gson-1.7.1/gson-1.7.1-javadoc.jar
    R lib/google-gson-1.7.1/gson-1.7.1-sources.jar
    R lib/google-gson-1.7.1/gson-1.7.1.jar

  Log Message:
  -----------
  removed gson libs


  Commit: 3bebdf4ba8dc5c5160961ecb4d7957415fbc765e
      https://github.com/guardianproject/SecureSmartCam/commit/3bebdf4ba8dc5c5160961ecb4d7957415fbc765e
  Author: Derek Halliday <halliday at gmail.com>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M assets/anon.png
    M res/drawable/ic_context_mask.png

  Log Message:
  -----------
  updated mashup mask - too fawkesian?


  Commit: 7a5c8cbfca9cdfed78c7cf9ceec2010d5a9a270a
      https://github.com/guardianproject/SecureSmartCam/commit/7a5c8cbfca9cdfed78c7cf9ceec2010d5a9a270a
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M assets/anon.png
    M res/drawable/ic_context_mask.png

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


  Commit: 167b9d72e02dfc1780382a3d9c984e4c4cec1b9b
      https://github.com/guardianproject/SecureSmartCam/commit/167b9d72e02dfc1780382a3d9c984e4c4cec1b9b
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M .classpath

  Log Message:
  -----------
  Removed JSON libs


  Commit: b0c5521a937a3d64ad8da32ce8501efec3bfd8b7
      https://github.com/guardianproject/SecureSmartCam/commit/b0c5521a937a3d64ad8da32ce8501efec3bfd8b7
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/FaceDetection.java

  Log Message:
  -----------
  Modified size of detected rects and made RectF rather than Rect


  Commit: 9d47ac11c2337589e7674f7e180616f344d3dce2
      https://github.com/guardianproject/SecureSmartCam/commit/9d47ac11c2337589e7674f7e180616f344d3dce2
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/GoogleFaceDetection.java

  Log Message:
  -----------
  Modified size of detected rects and made RectF rather than Rect


  Commit: fb5d634aeaa52d3198171869d4a2a029e999fc94
      https://github.com/guardianproject/SecureSmartCam/commit/fb5d634aeaa52d3198171869d4a2a029e999fc94
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

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

  Log Message:
  -----------
  Scaled auto detected rects


  Commit: cdee16ce56f7fa7f658afe3100cce9c0d817cec6
      https://github.com/guardianproject/SecureSmartCam/commit/cdee16ce56f7fa7f658afe3100cce9c0d817cec6
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  Added ability to move to SD card


  Commit: 6f50df25ecef1d874dea024f2547e5d0bc003029
      https://github.com/guardianproject/SecureSmartCam/commit/6f50df25ecef1d874dea024f2547e5d0bc003029
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

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

  Log Message:
  -----------
  Scaling created regions so they are smaller squares


  Commit: 50474126946bfb3e1cefe9037577912ed0a3f018
      https://github.com/guardianproject/SecureSmartCam/commit/50474126946bfb3e1cefe9037577912ed0a3f018
  Author: Derek Halliday <halliday at gmail.com>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    A TERMS

  Log Message:
  -----------
  added initial TERMS


  Commit: 2f2fd7b1fb6013abb11c8eadd86d51f1a6c60088
      https://github.com/guardianproject/SecureSmartCam/commit/2f2fd7b1fb6013abb11c8eadd86d51f1a6c60088
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M assets/anon.png
    A res/drawable/border.9.png
    M res/drawable/ic_context_mask.png
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  added white 9 pach border for unselected state


  Commit: 461716fe4e65a7b396c6bab111938e90d0b4ecfd
      https://github.com/guardianproject/SecureSmartCam/commit/461716fe4e65a7b396c6bab111938e90d0b4ecfd
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  Increased area for corner touches.  I had a hard time resizing regions.  Easier now


  Commit: 4a49c9f7bf1091da966767da044be0e63f078c94
      https://github.com/guardianproject/SecureSmartCam/commit/4a49c9f7bf1091da966767da044be0e63f078c94
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M res/menu/image_editor_menu.xml
    M src/org/witness/sscphase1/ImageEditor.java

  Log Message:
  -----------
  added preview menu option back in


  Commit: f9606032f674ea953c95b454697aeb4ca21534c4
      https://github.com/guardianproject/SecureSmartCam/commit/f9606032f674ea953c95b454697aeb4ca21534c4
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

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


  Commit: 66f355e746a8a48da91d764a15fad6c684932ed6
      https://github.com/guardianproject/SecureSmartCam/commit/66f355e746a8a48da91d764a15fad6c684932ed6
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M AndroidManifest.xml
    M CHANGELOG

  Log Message:
  -----------
  updated for latest release


  Commit: b36927dc71cf52ea9e5bf1f436bdd6d30e4f28ee
      https://github.com/guardianproject/SecureSmartCam/commit/b36927dc71cf52ea9e5bf1f436bdd6d30e4f28ee
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M res/drawable/ic_context_mask.png

  Log Message:
  -----------
  small change to menu icon


  Commit: 06271056c252e119b7d0cf138ceab1a3642bccc4
      https://github.com/guardianproject/SecureSmartCam/commit/06271056c252e119b7d0cf138ceab1a3642bccc4
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

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

  Log Message:
  -----------
  face detection is not automatic


  Commit: 287afed8471c24f4ea3cd5adb86d56b08c1dea77
      https://github.com/guardianproject/SecureSmartCam/commit/287afed8471c24f4ea3cd5adb86d56b08c1dea77
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  fixed NPE/null on the camera action intent


  Commit: fa2a787f07d889e63ca01ade5b9c1e0393aa8d92
      https://github.com/guardianproject/SecureSmartCam/commit/fa2a787f07d889e63ca01ade5b9c1e0393aa8d92
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M AndroidManifest.xml
    M CHANGELOG

  Log Message:
  -----------
  updating release files


  Commit: fee3e76f90c13a19bdf38ffeeb3a9b508ae2bbf8
      https://github.com/guardianproject/SecureSmartCam/commit/fee3e76f90c13a19bdf38ffeeb3a9b508ae2bbf8
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/PixelizeObscure.java

  Log Message:
  -----------
  fixed a divide by zero bug if the region is too small


  Commit: 85d10635edb5a36026e5d237b6ea06fb3be5d1de
      https://github.com/guardianproject/SecureSmartCam/commit/85d10635edb5a36026e5d237b6ea06fb3be5d1de
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-11 (Sat, 11 Jun 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  Removed bad line break


  Commit: 5d535fee086ef40f6207c0b3561bdb63193cd870
      https://github.com/guardianproject/SecureSmartCam/commit/5d535fee086ef40f6207c0b3561bdb63193cd870
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-11 (Sat, 11 Jun 2011)

  Changed paths:
    M res/layout-land/splashscreen.xml

  Log Message:
  -----------
  Didn't realize that we had different landscape layouts, had to add an id for one the elements that was causing a NPE


  Commit: 18c5931994309adc98d48487dff8fde378128841
      https://github.com/guardianproject/SecureSmartCam/commit/18c5931994309adc98d48487dff8fde378128841
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-11 (Sat, 11 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  Added note about intent.getData call


  Commit: ce195fe1f70dda8e054189bb17514ade90b4e987
      https://github.com/guardianproject/SecureSmartCam/commit/ce195fe1f70dda8e054189bb17514ade90b4e987
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-11 (Sat, 11 Jun 2011)

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

  Log Message:
  -----------
  Trying out a change to the realtime preview to disable it while actually editing a region.  When region is manipulated it is off, when done, it is back on.  Much more responsive for me.  What do you think?


  Commit: 7cec8c769bdedbb23dd3680562436731ffb152cc
      https://github.com/guardianproject/SecureSmartCam/commit/7cec8c769bdedbb23dd3680562436731ffb152cc
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-11 (Sat, 11 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  Trying out a change to the realtime preview to disable it while actually editing a region.  When region is manipulated it is off, when done, it is back on.  Much more responsive for me.  What do you think?


  Commit: 1dbb8bfcaeba2d1e74f632e8f23128892c9c1eb7
      https://github.com/guardianproject/SecureSmartCam/commit/1dbb8bfcaeba2d1e74f632e8f23128892c9c1eb7
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-12 (Sun, 12 Jun 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  modified for latest market release


  Commit: 5ffb5790d48e208aaf8c0bcfb364cd9500f63568
      https://github.com/guardianproject/SecureSmartCam/commit/5ffb5790d48e208aaf8c0bcfb364cd9500f63568
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-12 (Sun, 12 Jun 2011)

  Changed paths:
    M AndroidManifest.xml
    M res/layout-land/splashscreen.xml
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java
    M src/org/witness/sscphase1/ImageEditor.java
    M src/org/witness/sscphase1/ImageRegion.java

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

Conflicts:
	AndroidManifest.xml


  Commit: 1b913e9130d7b5d098a912c4deaa54b928eea190
      https://github.com/guardianproject/SecureSmartCam/commit/1b913e9130d7b5d098a912c4deaa54b928eea190
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-12 (Sun, 12 Jun 2011)

  Changed paths:
    M assets/anon.png

  Log Message:
  -----------
  trying a modification of the basic droid mask


  Commit: 7ae2c472ed25ce82c8ff963d1abeac8904b7cda1
      https://github.com/guardianproject/SecureSmartCam/commit/7ae2c472ed25ce82c8ff963d1abeac8904b7cda1
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-12 (Sun, 12 Jun 2011)

  Changed paths:
    M AndroidManifest.xml
    M CHANGELOG

  Log Message:
  -----------
  1.0.3 updates


  Commit: 43d906957c0e9fba7928fdfdc855423012f8e7fa
      https://github.com/guardianproject/SecureSmartCam/commit/43d906957c0e9fba7928fdfdc855423012f8e7fa
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-15 (Wed, 15 Jun 2011)

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

  Log Message:
  -----------
  added pullPathFromUri method


  Commit: fbef23ef19da5d3980d620c11f45143a04f85d34
      https://github.com/guardianproject/SecureSmartCam/commit/fbef23ef19da5d3980d620c11f45143a04f85d34
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-15 (Wed, 15 Jun 2011)

  Changed paths:
    M AndroidManifest.xml
    M CHANGELOG
    M assets/anon.png

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


  Commit: 78c9452506d822ff64ca2fcdeb2b01a6f7598b7b
      https://github.com/guardianproject/SecureSmartCam/commit/78c9452506d822ff64ca2fcdeb2b01a6f7598b7b
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  Removed splash screen


  Commit: 7a661c8b64439a98d2d6f4216519186223dadedd
      https://github.com/guardianproject/SecureSmartCam/commit/7a661c8b64439a98d2d6f4216519186223dadedd
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M res/layout-land/mainmenu.xml

  Log Message:
  -----------
  Modified to fit on screen better, could use a helping hand


  Commit: 06a67952c4a564c1c63d39ddee711e9bce7741d3
      https://github.com/guardianproject/SecureSmartCam/commit/06a67952c4a564c1c63d39ddee711e9bce7741d3
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M res/layout/mainmenu.xml

  Log Message:
  -----------
  Merged with splash screen, made layout a bit better, could still use a helping hand


  Commit: 4da5fe5d4e4cca9c31e3630a20adfe273ba5e362
      https://github.com/guardianproject/SecureSmartCam/commit/4da5fe5d4e4cca9c31e3630a20adfe273ba5e362
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M src/net/londatiga/android/QuickAction.java

  Log Message:
  -----------
  attempted to work around layout issues that crop up trying to auto popup before regions have had a chance to do their own layout.  Work arounds are commented out


  Commit: 6a565e9361484acbb422e65972d999b22396f609
      https://github.com/guardianproject/SecureSmartCam/commit/6a565e9361484acbb422e65972d999b22396f609
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  Added code to toggle between landscape and portrait layouts


  Commit: 33175a349ee6ab569546bdc26fc905755ffa7dc0
      https://github.com/guardianproject/SecureSmartCam/commit/33175a349ee6ab569546bdc26fc905755ffa7dc0
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

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

  Log Message:
  -----------
  added autopopup when regions are autodetected


  Commit: 923cb09b3f799a5162776026bf9a635c2d454e82
      https://github.com/guardianproject/SecureSmartCam/commit/923cb09b3f799a5162776026bf9a635c2d454e82
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/PixelizeObscure.java

  Log Message:
  -----------
  Added some comments about a pixel access bug that may have already been fixed


  Commit: 80dfa2eedb78283b370bb33bac79302ff58a3990
      https://github.com/guardianproject/SecureSmartCam/commit/80dfa2eedb78283b370bb33bac79302ff58a3990
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/SplashScreenActivity.java

  Log Message:
  -----------
  not sure ;-)


  Commit: 15170470b1524228967c8edac0559b645ac61188
      https://github.com/guardianproject/SecureSmartCam/commit/15170470b1524228967c8edac0559b645ac61188
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  added routines to do autopopup after a region is created.  Had to work around the fact that layouts aren't complete right away so a static 500 ms delay is introduced


  Commit: 9ee3e9ed226704a7fc25a4119836477f9ecefc5a
      https://github.com/guardianproject/SecureSmartCam/commit/9ee3e9ed226704a7fc25a4119836477f9ecefc5a
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  npe fix


  Commit: 00d37450040207b4a3cf30810d9bf1b245cf545b
      https://github.com/guardianproject/SecureSmartCam/commit/00d37450040207b4a3cf30810d9bf1b245cf545b
  Author: Derek Halliday <halliday at gmail.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M AndroidManifest.xml
    M res/layout-land/mainmenu.xml
    M res/layout/mainmenu.xml
    M src/org/witness/sscphase1/AnonObscure.java

  Log Message:
  -----------
  tweaks to mainmenu layout


  Commit: 1fdba4780f3f49126304abddc34dffa837251744
      https://github.com/guardianproject/SecureSmartCam/commit/1fdba4780f3f49126304abddc34dffa837251744
  Author: Derek Halliday <halliday at gmail.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M assets/anon.png

  Log Message:
  -----------
  replacing mask image


  Commit: d50b45b54844b9667195f018dfdf7db572c4bee6
      https://github.com/guardianproject/SecureSmartCam/commit/d50b45b54844b9667195f018dfdf7db572c4bee6
  Author: Derek Halliday <halliday at gmail.com>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/AnonObscure.java

  Log Message:
  -----------
  fixed mask obscure


  Commit: 20cd8b168f432ef43c1cb52cf7b1d2a705e8dd3b
      https://github.com/guardianproject/SecureSmartCam/commit/20cd8b168f432ef43c1cb52cf7b1d2a705e8dd3b
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M jni/byte_swapping.cpp
    M jni/byte_swapping.h
    R jni/byte_swapping.o
    M jni/iptc.cpp
    M jni/iptc.h
    R jni/iptc.o
    M jni/jpeg.cpp
    M jni/jpeg.h
    R jni/jpeg.o
    M jni/jpeg_decoder.cpp
    M jni/jpeg_decoder.h
    R jni/jpeg_decoder.o
    M jni/jpeg_dht.h
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.cpp
    R jni/photoshop_3block.cpp
    M jni/photoshop_3block.h
    R jni/photoshop_bim.cpp
    M jni/redaction.h
    M jni/tiff_ifd.cpp
    M jni/tiff_ifd.h
    R jni/tiff_ifd.o
    M jni/tiff_tag.cpp
    M jni/tiff_tag.h
    R jni/tiff_tag.o
    M res/layout/idtagger.xml
    M res/layout/imageregioninner.xml
    M res/values/strings.xml
    A src/org/witness/sscphase1/CrowdBlurObscure.java
    M src/org/witness/sscphase1/ImageEditor.java
    M src/org/witness/sscphase1/ImageRegion.java

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

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


  Commit: 88da26e70d5bbab5d880081d1496a8c5f4ed5a15
      https://github.com/guardianproject/SecureSmartCam/commit/88da26e70d5bbab5d880081d1496a8c5f4ed5a15
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M AndroidManifest.xml
    M assets/anon.png
    M res/layout-land/mainmenu.xml
    M res/layout/mainmenu.xml
    M src/net/londatiga/android/QuickAction.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/PixelizeObscure.java
    M src/org/witness/sscphase1/SplashScreenActivity.java

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


  Commit: ab4dc450e84e469a844f331b663bcb9a4a9226d0
      https://github.com/guardianproject/SecureSmartCam/commit/ab4dc450e84e469a844f331b663bcb9a4a9226d0
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-20 (Mon, 20 Jun 2011)

  Changed paths:
    R assets/anon.png
    A assets/mask.png

  Log Message:
  -----------
  added new mask graphic (funny moustache and nose)


  Commit: fee3faf80bb7f6b8a62cac1d908cb9cbd6d67dc3
      https://github.com/guardianproject/SecureSmartCam/commit/fee3faf80bb7f6b8a62cac1d908cb9cbd6d67dc3
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-20 (Mon, 20 Jun 2011)

  Changed paths:
    R src/org/witness/sscphase1/AnonObscure.java
    M src/org/witness/sscphase1/ImageEditor.java
    M src/org/witness/sscphase1/ImageRegion.java
    A src/org/witness/sscphase1/MaskObscure.java

  Log Message:
  -----------
  updating MaskObscure method


  Commit: db023c3f20af5d1477bac8e137046ccb2ba2c5d7
      https://github.com/guardianproject/SecureSmartCam/commit/db023c3f20af5d1477bac8e137046ccb2ba2c5d7
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-20 (Mon, 20 Jun 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated to 1.0.4


  Commit: 44dc82a313d100ad74e19cd99c3dda9cb55b138a
      https://github.com/guardianproject/SecureSmartCam/commit/44dc82a313d100ad74e19cd99c3dda9cb55b138a
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-21 (Tue, 21 Jun 2011)

  Changed paths:
    M res/drawable/ic_context_mask.png

  Log Message:
  -----------
  updated mask icon


  Commit: 12bfa68ba58812bb2b7c161fd2d12ffc45265402
      https://github.com/guardianproject/SecureSmartCam/commit/12bfa68ba58812bb2b7c161fd2d12ffc45265402
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-21 (Tue, 21 Jun 2011)

  Changed paths:
    M src/org/witness/sscphase1/CrowdBlurObscure.java
    M src/org/witness/sscphase1/ImageEditor.java
    M src/org/witness/sscphase1/ImageRegion.java
    M src/org/witness/sscphase1/PixelizeObscure.java

  Log Message:
  -----------
  optimized pixelization routine and fixed repaint bug


  Commit: 605be6de5a99f95270e6c1ac553995679562606e
      https://github.com/guardianproject/SecureSmartCam/commit/605be6de5a99f95270e6c1ac553995679562606e
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M assets/mask.png
    M res/values/strings.xml

  Log Message:
  -----------
  small changes to mask and app label string


  Commit: 0ef57ebebee55fbfb47df242cee0caa17d33e9f3
      https://github.com/guardianproject/SecureSmartCam/commit/0ef57ebebee55fbfb47df242cee0caa17d33e9f3
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

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

  Log Message:
  -----------
  minor change to 'saved' string display via toast


  Commit: 831154fe49d7e85faf7f648ecc90c741077defa0
      https://github.com/guardianproject/SecureSmartCam/commit/831154fe49d7e85faf7f648ecc90c741077defa0
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated app version and added Activity label


  Commit: 8c0bd9a4080b978a3b2fead50f8a74b3c8a79bd5
      https://github.com/guardianproject/SecureSmartCam/commit/8c0bd9a4080b978a3b2fead50f8a74b3c8a79bd5
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

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

  Log Message:
  -----------
  commented out pullPathFromUri() that was causing a NPE, even though this function seemed to have no purposed. closes #75.


  Commit: 12dd3c6405886598ec467cd2bf66560ec7ff0078
      https://github.com/guardianproject/SecureSmartCam/commit/12dd3c6405886598ec467cd2bf66560ec7ff0078
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

  Changed paths:
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  strange NPE on trying to open Gallery. added try/catch around the call to catch it in future instances.


  Commit: 7f947b338d90bbb6f3e07af07e0e41d5fd413d0d
      https://github.com/guardianproject/SecureSmartCam/commit/7f947b338d90bbb6f3e07af07e0e41d5fd413d0d
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

  Changed paths:
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  closes #71


  Commit: 2cf46920470c24b6dfe1ffcc7f436f1c49a0e5a6
      https://github.com/guardianproject/SecureSmartCam/commit/2cf46920470c24b6dfe1ffcc7f436f1c49a0e5a6
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

  Changed paths:
    M src/org/witness/sscphase1/PixelizeObscure.java

  Log Message:
  -----------
  fixed math on pixelation bounds calc; also fill in spaces smaller than block size; closes #62.


  Commit: 3c04a685211991e1896cf2a3902e584477d293ae
      https://github.com/guardianproject/SecureSmartCam/commit/3c04a685211991e1896cf2a3902e584477d293ae
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

  Changed paths:
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  changed "external media" gallery intent launch to a PICK action using image/* mimetype. Works now with internal or external memory and no SDCard error failures. Closes #56.


  Commit: 555f11aeb633c3be57c74848d9d30cbe8eaa4a9c
      https://github.com/guardianproject/SecureSmartCam/commit/555f11aeb633c3be57c74848d9d30cbe8eaa4a9c
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

  Changed paths:
    M res/layout/mainmenu.xml

  Log Message:
  -----------
  changed mainmenu strings to "take photo" and "select photo"


  Commit: 6f06981bffe65248b38cc7d9434659b5cdf9f379
      https://github.com/guardianproject/SecureSmartCam/commit/6f06981bffe65248b38cc7d9434659b5cdf9f379
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  preparing for "move and zoom" functionality


  Commit: ef624e094545015beeb9e94a51a66bb69d1ca57d
      https://github.com/guardianproject/SecureSmartCam/commit/ef624e094545015beeb9e94a51a66bb69d1ca57d
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

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

  Log Message:
  -----------
  refactored code for getting camera and gallery data loaded into the app. related to #57 and other tickets.


  Commit: f69d860958e4ffa9f8391ea9dba3875fd55ebbc4
      https://github.com/guardianproject/SecureSmartCam/commit/f69d860958e4ffa9f8391ea9dba3875fd55ebbc4
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

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

  Log Message:
  -----------
  enabled data/timestamp to be added on gallery save/export so that the images show up properly. closes issue #63.


  Commit: f337102918c0b835c2c13c70b174c9fa3ffaa205
      https://github.com/guardianproject/SecureSmartCam/commit/f337102918c0b835c2c13c70b174c9fa3ffaa205
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

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

  Log Message:
  -----------
  updated createObscureBitmap to reuse obscured bitmap and canvas instead of recreating every single time


  Commit: 324931c9d387cac7e17dc3124b41796edf26e2d6
      https://github.com/guardianproject/SecureSmartCam/commit/324931c9d387cac7e17dc3124b41796edf26e2d6
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

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

  Log Message:
  -----------
  closes #55. cacheing obscured bitmap and canvas now. should significantly decrease memory use.


  Commit: ef303f480776e401a8806f47922623c9f37674d9
      https://github.com/guardianproject/SecureSmartCam/commit/ef303f480776e401a8806f47922623c9f37674d9
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-22 (Mon, 22 Aug 2011)

  Changed paths:
    R src/org/witness/sscphase1/BlurObscure.java
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java
    R src/org/witness/sscphase1/CrowdBlurObscure.java
    R src/org/witness/sscphase1/FaceDetection.java
    R src/org/witness/sscphase1/GoogleFaceDetection.java
    M src/org/witness/sscphase1/ImageEditor.java
    R src/org/witness/sscphase1/MaskObscure.java
    R src/org/witness/sscphase1/ObscureMethod.java
    R src/org/witness/sscphase1/PaintSquareObscure.java
    R src/org/witness/sscphase1/PixelizeObscure.java
    A src/org/witness/sscphase1/detect/FaceDetection.java
    A src/org/witness/sscphase1/detect/GoogleFaceDetection.java
    A src/org/witness/sscphase1/filters/BlurObscure.java
    A src/org/witness/sscphase1/filters/CrowdBlurObscure.java
    A src/org/witness/sscphase1/filters/MaskObscure.java
    A src/org/witness/sscphase1/filters/ObscureMethod.java
    A src/org/witness/sscphase1/filters/PaintSquareObscure.java
    A src/org/witness/sscphase1/filters/PixelizeObscure.java

  Log Message:
  -----------
  created subpackages for filters and detection; moved classes around


  Commit: 207a24dd7f3746ed99dcc2776692c65a2257cbce
      https://github.com/guardianproject/SecureSmartCam/commit/207a24dd7f3746ed99dcc2776692c65a2257cbce
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

  Changed paths:
    M res/values/strings.xml
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  improved handling of camera/gallery intent loading, and new "loading" spinning wheel screen UI. fixes #57.


  Commit: c0b9f0481a44cc40958237fe1013ba2c1b519ca9
      https://github.com/guardianproject/SecureSmartCam/commit/c0b9f0481a44cc40958237fe1013ba2c1b519ca9
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

  Changed paths:
    A res/layout/mainloading.xml

  Log Message:
  -----------
  adding new main loading layout


  Commit: d70155a5a002f8b83f92ca0a74b9aa9bbf639443
      https://github.com/guardianproject/SecureSmartCam/commit/d70155a5a002f8b83f92ca0a74b9aa9bbf639443
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

  Changed paths:
    M src/net/londatiga/android/QuickAction.java

  Log Message:
  -----------
  cached action popup menu instead of recreating it everytime


  Commit: 74c3482e45764c345a4539afef25f09bec197db0
      https://github.com/guardianproject/SecureSmartCam/commit/74c3482e45764c345a4539afef25f09bec197db0
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

  Changed paths:
    M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  reuse action popup; don't create anew each time


  Commit: 25fb5eab324645ca0bc617877ced14a59a189e5f
      https://github.com/guardianproject/SecureSmartCam/commit/25fb5eab324645ca0bc617877ced14a59a189e5f
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

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

  Log Message:
  -----------
  added version number to title and about menu


  Commit: b189cf8e2e19a37ef8d8942a50fc24d88d8d76b7
      https://github.com/guardianproject/SecureSmartCam/commit/b189cf8e2e19a37ef8d8942a50fc24d88d8d76b7
  Author: Harlo Holmes <harlo.holmes at gmail.com>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

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

  Log Message:
  -----------
  - added NPE handler for GoogleFaceDetection class (as per https://github.com/guardianproject/SecureSmartCam/issues/66)
- media scanner scans new jpeg on save (as per https://github.com/guardianproject/SecureSmartCam/issues/60)


  Commit: 50c4ef96f7745db71234120d499eafff11784f7c
      https://github.com/guardianproject/SecureSmartCam/commit/50c4ef96f7745db71234120d499eafff11784f7c
  Author: Harlo Holmes <harlo.holmes at gmail.com>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

  Changed paths:
    A res/layout/mainloading.xml
    M res/values/strings.xml
    M src/net/londatiga/android/QuickAction.java
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java
    M src/org/witness/sscphase1/ImageEditor.java
    M src/org/witness/sscphase1/ImageRegion.java

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


  Commit: 9d122e1d0d21d2c617c6771bea1e7253b3f12559
      https://github.com/guardianproject/SecureSmartCam/commit/9d122e1d0d21d2c617c6771bea1e7253b3f12559
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated version


  Commit: add9071d3b1fd660777f3abd9703931384780cce
      https://github.com/guardianproject/SecureSmartCam/commit/add9071d3b1fd660777f3abd9703931384780cce
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

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

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

Conflicts:
	AndroidManifest.xml


  Commit: 32ef3ec4849132d98fe61a2f24a34f06a24f7fa6
      https://github.com/guardianproject/SecureSmartCam/commit/32ef3ec4849132d98fe61a2f24a34f06a24f7fa6
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-25 (Thu, 25 Aug 2011)

  Changed paths:
    M src/net/londatiga/android/QuickAction.java

  Log Message:
  -----------
  fixed quick action popup sizing


  Commit: 33ab6c6683e795c9c5b9d8b41baf6ee36ee267c9
      https://github.com/guardianproject/SecureSmartCam/commit/33ab6c6683e795c9c5b9d8b41baf6ee36ee267c9
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-25 (Thu, 25 Aug 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  a little update


  Commit: 2a9be3c7263589ccfb81a26cca1e9a48e809482a
      https://github.com/guardianproject/SecureSmartCam/commit/2a9be3c7263589ccfb81a26cca1e9a48e809482a
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-05 (Mon, 05 Sep 2011)

  Changed paths:
    M res/values/strings.xml
    M src/net/londatiga/android/QuickAction.java
    M src/org/witness/sscphase1/CameraObscuraMainMenu.java

  Log Message:
  -----------
  added About menu. closes #59. change to QuickAction menu.


  Commit: f048e1f7b5809d4e3fdc90ba6f6c54624b62c723
      https://github.com/guardianproject/SecureSmartCam/commit/f048e1f7b5809d4e3fdc90ba6f6c54624b62c723
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-07 (Wed, 07 Sep 2011)

  Changed paths:
    A libs/armeabi/libJpegRedaction.so

  Log Message:
  -----------
  added bin build of latest Jpeg-Redact from ASenior


  Commit: 57424567e671dd0be5fcf4f5caafb127c952b927
      https://github.com/guardianproject/SecureSmartCam/commit/57424567e671dd0be5fcf4f5caafb127c952b927
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-07 (Wed, 07 Sep 2011)

  Changed paths:
    M jni/Android.mk
    M jni/Application.mk
    R jni/Makefile
    R jni/byte_swapping.cpp
    R jni/byte_swapping.h
    R jni/iptc.cpp
    R jni/iptc.h
    R jni/jpeg.cpp
    R jni/jpeg.h
    R jni/jpeg_decoder.cpp
    R jni/jpeg_decoder.h
    R jni/jpeg_dht.h
    R jni/libredact.a
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.cpp
    R jni/photoshop_3block.h
    R jni/photoshop_bim.h
    R jni/redaction.h
    R jni/tiff_ifd.cpp
    R jni/tiff_ifd.h
    R jni/tiff_tag.cpp
    R jni/tiff_tag.h

  Log Message:
  -----------
  removed code from JpegRedact project - should pull from there


  Commit: 87606f2d8e8913d6c9a0bf59ebf6fe5e7b1e6ac1
      https://github.com/guardianproject/SecureSmartCam/commit/87606f2d8e8913d6c9a0bf59ebf6fe5e7b1e6ac1
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-11 (Sun, 11 Sep 2011)

  Changed paths:
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.cpp
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.h

  Log Message:
  -----------
  updated classes to support redaction method


  Commit: f785ade3055a2a4f6a3b965cdd1c8d05782b48f9
      https://github.com/guardianproject/SecureSmartCam/commit/f785ade3055a2a4f6a3b965cdd1c8d05782b48f9
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-11 (Sun, 11 Sep 2011)

  Changed paths:
    M src/net/londatiga/android/QuickAction.java
    A src/org/witness/securesmartcam/CameraObscuraPreferences.java
    A src/org/witness/securesmartcam/ImageEditor.java
    A src/org/witness/securesmartcam/ImagePreview.java
    A src/org/witness/securesmartcam/ImageRegion.java
    A src/org/witness/securesmartcam/SplashScreenActivity.java
    A src/org/witness/securesmartcam/detect/FaceDetection.java
    A src/org/witness/securesmartcam/detect/GoogleFaceDetection.java
    A src/org/witness/securesmartcam/filters/BlurObscure.java
    A src/org/witness/securesmartcam/filters/CrowdBlurObscure.java
    A src/org/witness/securesmartcam/filters/MaskObscure.java
    A src/org/witness/securesmartcam/filters/ObscureMethod.java
    A src/org/witness/securesmartcam/filters/PaintSquareObscure.java
    A src/org/witness/securesmartcam/filters/PixelizeObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java
    R src/org/witness/sscphase1/CameraObscuraMainMenu.java
    R src/org/witness/sscphase1/CameraObscuraPreferences.java
    R src/org/witness/sscphase1/ImageEditor.java
    R src/org/witness/sscphase1/ImagePreview.java
    R src/org/witness/sscphase1/ImageRegion.java
    A src/org/witness/sscphase1/ObscuraApp.java
    R src/org/witness/sscphase1/SplashScreenActivity.java
    R src/org/witness/sscphase1/detect/FaceDetection.java
    R src/org/witness/sscphase1/detect/GoogleFaceDetection.java
    R src/org/witness/sscphase1/filters/BlurObscure.java
    R src/org/witness/sscphase1/filters/CrowdBlurObscure.java
    R src/org/witness/sscphase1/filters/MaskObscure.java
    R src/org/witness/sscphase1/filters/ObscureMethod.java
    R src/org/witness/sscphase1/filters/PaintSquareObscure.java
    R src/org/witness/sscphase1/filters/PixelizeObscure.java

  Log Message:
  -----------
  refacted lots of code; native obscuring mostly working for pixelate, strip, rev pixellate


  Commit: f6da43b7346e220e7c639539147c33d06a081e22
      https://github.com/guardianproject/SecureSmartCam/commit/f6da43b7346e220e7c639539147c33d06a081e22
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-11 (Sun, 11 Sep 2011)

  Changed paths:
    M libs/armeabi/libJpegRedaction.so

  Log Message:
  -----------
  updated redact lib


  Commit: 1be014096e10c326b345cca0bc150316970a153f
      https://github.com/guardianproject/SecureSmartCam/commit/1be014096e10c326b345cca0bc150316970a153f
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-11 (Sun, 11 Sep 2011)

  Changed paths:
    M .project
    M AndroidManifest.xml

  Log Message:
  -----------
  updating project files


  Commit: 67b4d6f0455c66a6c7003c9a73ea9ce5bddd9ae6
      https://github.com/guardianproject/SecureSmartCam/commit/67b4d6f0455c66a6c7003c9a73ea9ce5bddd9ae6
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-11 (Sun, 11 Sep 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  changed ANON to OVERLAY obsure type


  Commit: f34d9cd0b80154d87b3f2f4c5a782fde7c7a6488
      https://github.com/guardianproject/SecureSmartCam/commit/f34d9cd0b80154d87b3f2f4c5a782fde7c7a6488
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-11 (Sun, 11 Sep 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  added check to see if native redact possible


  Commit: e143ff69504f63f787630a3ff210e53fbdf15135
      https://github.com/guardianproject/SecureSmartCam/commit/e143ff69504f63f787630a3ff210e53fbdf15135
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-14 (Wed, 14 Sep 2011)

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

  Log Message:
  -----------
  better error handling, small tweak for camera image loading


  Commit: 89ec97d8f262f69d756937fa934b7b4cadc4391f
      https://github.com/guardianproject/SecureSmartCam/commit/89ec97d8f262f69d756937fa934b7b4cadc4391f
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-14 (Wed, 14 Sep 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated version


  Commit: dcaeec91b3e37636b87affe8599fc94d552e1857
      https://github.com/guardianproject/SecureSmartCam/commit/dcaeec91b3e37636b87affe8599fc94d552e1857
  Author: vanevery <vanevery at walking-productions.com>
  Date:   2011-09-14 (Wed, 14 Sep 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  Checking initial image orientation and rotating


  Commit: c670e7db2443236615851864ba7f30d678ede9d1
      https://github.com/guardianproject/SecureSmartCam/commit/c670e7db2443236615851864ba7f30d678ede9d1
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-20 (Tue, 20 Sep 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  disabled native code for now


  Commit: 23a22bf61e1290dfc5cfaf04173d86ad0f2a470b
      https://github.com/guardianproject/SecureSmartCam/commit/23a22bf61e1290dfc5cfaf04173d86ad0f2a470b
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-20 (Tue, 20 Sep 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

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


  Commit: b58704a69df553a45031ab50400c2eb419e189d9
      https://github.com/guardianproject/SecureSmartCam/commit/b58704a69df553a45031ab50400c2eb419e189d9
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-20 (Tue, 20 Sep 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  committing updated version for 1.1-FINAL


  Commit: 76cf8a40ea6cd9a7c651dda6b1c98f88cdcf8f5d
      https://github.com/guardianproject/SecureSmartCam/commit/76cf8a40ea6cd9a7c651dda6b1c98f88cdcf8f5d
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-20 (Tue, 20 Sep 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  fix dialog NPE on "Share"


  Commit: eff6366f34629518ff89aedd589579ed4a81769b
      https://github.com/guardianproject/SecureSmartCam/commit/eff6366f34629518ff89aedd589579ed4a81769b
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-21 (Wed, 21 Sep 2011)

  Changed paths:
    R libs/armeabi/libJpegRedaction.so

  Log Message:
  -----------
  removed binary for now


  Commit: c600541782bbbfde10627f757c1b9d028ab62305
      https://github.com/guardianproject/SecureSmartCam/commit/c600541782bbbfde10627f757c1b9d028ab62305
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-21 (Wed, 21 Sep 2011)

  Changed paths:
    M res/values/strings.xml

  Log Message:
  -----------
  added yes/no strings. closes #82.


  Commit: d88df1bcd7340014c9ce5f8788ac921d3baa31eb
      https://github.com/guardianproject/SecureSmartCam/commit/d88df1bcd7340014c9ce5f8788ac921d3baa31eb
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-21 (Wed, 21 Sep 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  removes "export" dialog on image preview. closes #81.


  Commit: 557bd7e694727a4aa89947b30689a858139d9cfb
      https://github.com/guardianproject/SecureSmartCam/commit/557bd7e694727a4aa89947b30689a858139d9cfb
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-21 (Wed, 21 Sep 2011)

  Changed paths:
    M AndroidManifest.xml
    M CHANGELOG

  Log Message:
  -----------
  updating project files


  Commit: 2e28ad6334536bdeec8d2ffccfcb6c30a167df6f
      https://github.com/guardianproject/SecureSmartCam/commit/2e28ad6334536bdeec8d2ffccfcb6c30a167df6f
  Author: LvH <LvH at VIDEOCLASH-2.local>
  Date:   2011-09-23 (Fri, 23 Sep 2011)

  Changed paths:
    M .classpath
    M .project
    M AndroidManifest.xml
    A CHANGELOG
    M LICENSE
    M README
    A TERMS
    R assets/anon.png
    R assets/camera_obscura.db
    A assets/mask.png
    M jni/Android.mk
    M jni/Application.mk
    R jni/Makefile
    R jni/byte_swapping.cpp
    R jni/byte_swapping.h
    R jni/iptc.cpp
    R jni/iptc.h
    R jni/jpeg.cpp
    R jni/jpeg.h
    R jni/jpeg_decoder.cpp
    R jni/jpeg_decoder.h
    R jni/jpeg_dht.h
    R jni/libredact.a
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.cpp
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.h
    R jni/photoshop_3block.h
    R jni/photoshop_bim.h
    R jni/redaction.h
    R jni/tiff_ifd.cpp
    R jni/tiff_ifd.h
    R jni/tiff_tag.cpp
    R jni/tiff_tag.h
    R lib/google-gson-1.7.1-release.zip
    R lib/google-gson-1.7.1/LICENSE
    R lib/google-gson-1.7.1/README
    R lib/google-gson-1.7.1/gson-1.7.1-javadoc.jar
    R lib/google-gson-1.7.1/gson-1.7.1-sources.jar
    R lib/google-gson-1.7.1/gson-1.7.1.jar
    A res/drawable-hdpi/ic_menu_about.png
    A res/drawable-hdpi/ic_menu_preview.png
    A res/drawable-hdpi/ic_menu_trash.png
    A res/drawable/border.9.png
    A res/drawable/ic_context_blur.png
    A res/drawable/ic_context_delete.png
    R res/drawable/ic_context_destroy.png
    A res/drawable/ic_context_fill.png
    A res/drawable/ic_context_mask.png
    A res/drawable/ic_context_pixelate.png
    M res/layout-land/mainmenu.xml
    M res/layout-land/splashscreen.xml
    A res/layout/imagepreview.xml
    M res/layout/imageregioninner.xml
    M res/layout/imageviewer.xml
    A res/layout/mainloading.xml
    M res/layout/mainmenu.xml
    M res/layout/splashscreen.xml
    M res/menu/image_editor_menu.xml
    M res/values/strings.xml
    M src/net/londatiga/android/QuickAction.java
    A src/org/witness/securesmartcam/CameraObscuraPreferences.java
    A src/org/witness/securesmartcam/ImageEditor.java
    A src/org/witness/securesmartcam/ImagePreview.java
    A src/org/witness/securesmartcam/ImageRegion.java
    A src/org/witness/securesmartcam/SplashScreenActivity.java
    A src/org/witness/securesmartcam/detect/FaceDetection.java
    A src/org/witness/securesmartcam/detect/GoogleFaceDetection.java
    A src/org/witness/securesmartcam/filters/BlurObscure.java
    A src/org/witness/securesmartcam/filters/CrowdBlurObscure.java
    A src/org/witness/securesmartcam/filters/MaskObscure.java
    A src/org/witness/securesmartcam/filters/ObscureMethod.java
    A src/org/witness/securesmartcam/filters/PaintSquareObscure.java
    A src/org/witness/securesmartcam/filters/PixelizeObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java
    R src/org/witness/sscphase1/AnonObscure.java
    R src/org/witness/sscphase1/BlurObscure.java
    R src/org/witness/sscphase1/CameraObscura.java
    R src/org/witness/sscphase1/CameraObscuraMainMenu.java
    R src/org/witness/sscphase1/CameraObscuraPreferences.java
    R src/org/witness/sscphase1/EXIFWiper.java
    R src/org/witness/sscphase1/FaceDetection.java
    R src/org/witness/sscphase1/GoogleFaceDetection.java
    R src/org/witness/sscphase1/IdTagger.java
    R src/org/witness/sscphase1/ImageRegion.java
    A src/org/witness/sscphase1/ObscuraApp.java
    R src/org/witness/sscphase1/ObscureMethod.java
    R src/org/witness/sscphase1/PaintSquareObscure.java
    R src/org/witness/sscphase1/PixelizeObscure.java
    R src/org/witness/sscphase1/PreferencesActivity.java
    R src/org/witness/sscphase1/SSCCalculator.java
    R src/org/witness/sscphase1/SSCImagePrefs.java
    R src/org/witness/sscphase1/SSCMetadataHandler.java
    R src/org/witness/sscphase1/SSCSensorSucker.java
    R src/org/witness/sscphase1/SSCTagContainer.java
    R src/org/witness/sscphase1/SplashScreenActivity.java
    R src/org/witness/sscphase1/secure/Apg.java
    R src/org/witness/sscphase1/secure/CryptoProvider.java
    R src/org/witness/sscphase1/secure/EncryptObscureMethod.java
    R src/org/witness/sscphase1/secure/EncryptTagger.java
    R src/org/witness/sscphase1/secure/GPGExportActivity.java
    R src/org/witness/sscphase1/secure/MediaHasher.java
    A update-ant-build.sh

  Log Message:
  -----------
  merging


  Commit: 4c69c5e0d1d404a6088811ce96e23471862d83da
      https://github.com/guardianproject/SecureSmartCam/commit/4c69c5e0d1d404a6088811ce96e23471862d83da
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-25 (Sun, 25 Sep 2011)

  Changed paths:
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.cpp
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.h

  Log Message:
  -----------
  added initial support for string multi-region Redaction define


  Commit: b903496ce48c1106cc52f6a81b0b0d04de3fb6ac
      https://github.com/guardianproject/SecureSmartCam/commit/b903496ce48c1106cc52f6a81b0b0d04de3fb6ac
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-25 (Sun, 25 Sep 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

  Log Message:
  -----------
  implemented support for native lib redaction on some obscure types


  Commit: 78219b9f827e2746006646e685643736911fc07a
      https://github.com/guardianproject/SecureSmartCam/commit/78219b9f827e2746006646e685643736911fc07a
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-25 (Sun, 25 Sep 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated build version


  Commit: 4508ecda949bd4cac98933920e15e8d9efd8feb6
      https://github.com/guardianproject/SecureSmartCam/commit/4508ecda949bd4cac98933920e15e8d9efd8feb6
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-25 (Sun, 25 Sep 2011)

  Changed paths:
    A libs/armeabi/libJpegRedaction.so

  Log Message:
  -----------
  adding in binary build of JpegRedaction library


  Commit: 2f42bd4a04f1a26e35f5ca0d5431cbb952257a0a
      https://github.com/guardianproject/SecureSmartCam/commit/2f42bd4a04f1a26e35f5ca0d5431cbb952257a0a
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-25 (Sun, 25 Sep 2011)

  Changed paths:
    A jni/README.md

  Log Message:
  -----------
  adding in readme for JpegRedaction library


  Commit: 78ed4922fb44a1c99880733f8acb775a636943a9
      https://github.com/guardianproject/SecureSmartCam/commit/78ed4922fb44a1c99880733f8acb775a636943a9
  Author: Harlo Holmes <harlo.holmes at gmail.com>
  Date:   2011-10-11 (Tue, 11 Oct 2011)

  Changed paths:
    M .classpath
    M AndroidManifest.xml
    A libs/armeabi/libdatabase_sqlcipher.so
    A libs/armeabi/libsqlcipher.so
    A libs/armeabi/libsqlcipher_android-10.so
    A libs/armeabi/libsqlcipher_android-11.so
    A libs/armeabi/libsqlcipher_android-12.so
    A libs/armeabi/libsqlcipher_android-13.so
    A libs/armeabi/libsqlcipher_android-7.so
    A libs/armeabi/libsqlcipher_android-8.so
    A libs/armeabi/libsqlcipher_android-9.so
    A libs/armeabi/libsqlcipher_android.so
    A libs/armeabi/libstlport_shared.so
    A libs/commons-codec.jar
    A libs/guava-r09.jar
    A libs/sqlcipher.jar
    A res/layout/informaeditor.xml
    M res/xml/preferences.xml
    A src/org/witness/informa/InformaEditor.java
    A src/org/witness/informa/SensorSucker.java
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  laying groundwork for informa mode...


  Commit: 52c982f006e5ea0ee2e31a8ae21b53ea48e4132a
      https://github.com/guardianproject/SecureSmartCam/commit/52c982f006e5ea0ee2e31a8ae21b53ea48e4132a
  Author: Harlo Holmes <harlo.holmes at gmail.com>
  Date:   2011-10-11 (Tue, 11 Oct 2011)

  Changed paths:
    M src/org/witness/informa/InformaEditor.java
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  minor fix


  Commit: 9d5c5c4a5546785da639a9c60599352aabb5845c
      https://github.com/guardianproject/SecureSmartCam/commit/9d5c5c4a5546785da639a9c60599352aabb5845c
  Author: Harlo Holmes <harlo.holmes at gmail.com>
  Date:   2011-10-11 (Tue, 11 Oct 2011)

  Changed paths:
    M AndroidManifest.xml
    R res/layout/encrypttagger.xml
    R res/layout/idtagger.xml
    R res/layout/imageprefs.xml
    A res/layout/informa_options.xml
    M res/layout/informaeditor.xml
    M res/values/strings.xml
    M src/org/witness/informa/InformaEditor.java
    A src/org/witness/informa/utils/InformaOptions.java
    A src/org/witness/informa/utils/InformaOptionsAdapter.java

  Log Message:
  -----------
  some basic ui for informa


  Commit: 9249202788daa3bdf8b054b465c64c95110c35be
      https://github.com/guardianproject/SecureSmartCam/commit/9249202788daa3bdf8b054b465c64c95110c35be
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-11 (Tue, 11 Oct 2011)

  Changed paths:
    M src/net/londatiga/android/ActionItem.java
    A src/net/londatiga/android/PopupWindows.java
    M src/net/londatiga/android/QuickAction.java
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    R src/org/witness/securesmartcam/filters/CrowdBlurObscure.java
    A src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

  Log Message:
  -----------
  updated popup menu code, renamed filters


  Commit: b8b1abd813ab46bd7a4b13d6b596ee5fa63741f8
      https://github.com/guardianproject/SecureSmartCam/commit/b8b1abd813ab46bd7a4b13d6b596ee5fa63741f8
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-11 (Tue, 11 Oct 2011)

  Changed paths:
    A res/anim/rail.xml
    M res/layout/action_item.xml

  Log Message:
  -----------
  updated popup animation and layouts


  Commit: b2b461e407a94b04b8a9a574528575b64805c2d2
      https://github.com/guardianproject/SecureSmartCam/commit/b2b461e407a94b04b8a9a574528575b64805c2d2
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-12 (Wed, 12 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/securesmartcam/filters/BlurObscure.java
    M src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java
    M src/org/witness/securesmartcam/filters/MaskObscure.java
    R src/org/witness/securesmartcam/filters/ObscureMethod.java
    M src/org/witness/securesmartcam/filters/PaintSquareObscure.java
    M src/org/witness/securesmartcam/filters/PixelizeObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

  Log Message:
  -----------
  updated obsure methods and relevant code that uses them


  Commit: 9289ba33236e2970473cb1d59cfa702b48e39337
      https://github.com/guardianproject/SecureSmartCam/commit/9289ba33236e2970473cb1d59cfa702b48e39337
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-12 (Wed, 12 Oct 2011)

  Changed paths:
    A src/org/witness/securesmartcam/filters/ConsentTagger.java
    A src/org/witness/securesmartcam/filters/RegionProcesser.java
    A src/org/witness/securesmartcam/filters/TintObscure.java

  Log Message:
  -----------
  updated filter method code - added RegionProcessor


  Commit: c0b3aca8e7e9349ec50d1572d443b70c92aa4404
      https://github.com/guardianproject/SecureSmartCam/commit/c0b3aca8e7e9349ec50d1572d443b70c92aa4404
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-12 (Wed, 12 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/securesmartcam/filters/ConsentTagger.java
    M src/org/witness/securesmartcam/filters/MaskObscure.java
    M src/org/witness/securesmartcam/filters/PixelizeObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

  Log Message:
  -----------
  moved RegionProc's to be instances inside of ImageRegion


  Commit: a593bd9430b44df781bf8c323236193749be7bff
      https://github.com/guardianproject/SecureSmartCam/commit/a593bd9430b44df781bf8c323236193749be7bff
  Author: Harlo Holmes <harlo.holmes at gmail.com>
  Date:   2011-10-12 (Wed, 12 Oct 2011)

  Changed paths:
    M res/layout/informa_options.xml
    M src/org/witness/informa/InformaEditor.java
    M src/org/witness/informa/utils/InformaOptions.java
    M src/org/witness/informa/utils/InformaOptionsAdapter.java
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  got to a place where Informa UI delivers consent info to ImageEditor class.  Will now merge with Obscurav1 where the indentification module is it's own "filter"


  Commit: afbd42ed1addd3b1247070dd7d4d187010869f2b
      https://github.com/guardianproject/SecureSmartCam/commit/afbd42ed1addd3b1247070dd7d4d187010869f2b
  Author: Harlo Holmes <harlo.holmes at gmail.com>
  Date:   2011-10-12 (Wed, 12 Oct 2011)

  Changed paths:
    M AndroidManifest.xml
    A jni/README.md
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.cpp
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.h
    A libs/armeabi/libJpegRedaction.so
    A res/anim/rail.xml
    M res/layout/action_item.xml
    M src/net/londatiga/android/ActionItem.java
    A src/net/londatiga/android/PopupWindows.java
    M src/net/londatiga/android/QuickAction.java
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/securesmartcam/filters/BlurObscure.java
    A src/org/witness/securesmartcam/filters/ConsentTagger.java
    R src/org/witness/securesmartcam/filters/CrowdBlurObscure.java
    A src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java
    M src/org/witness/securesmartcam/filters/MaskObscure.java
    R src/org/witness/securesmartcam/filters/ObscureMethod.java
    M src/org/witness/securesmartcam/filters/PaintSquareObscure.java
    M src/org/witness/securesmartcam/filters/PixelizeObscure.java
    A src/org/witness/securesmartcam/filters/RegionProcesser.java
    A src/org/witness/securesmartcam/filters/TintObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

  Log Message:
  -----------
  Merge branch 'obscurav1' into informaV1

Conflicts:
	src/org/witness/securesmartcam/ImageRegion.java


  Commit: d4c40835abe94ce2b771269d9b1fd99f0da812e9
      https://github.com/guardianproject/SecureSmartCam/commit/d4c40835abe94ce2b771269d9b1fd99f0da812e9
  Author: Harlo Holmes <harlo.holmes at gmail.com>
  Date:   2011-10-12 (Wed, 12 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/securesmartcam/filters/ConsentTagger.java

  Log Message:
  -----------
  linking informa interface with new changes in obscurav1


  Commit: d9d199e5c84eb4812158637c6d62f42b1c348c32
      https://github.com/guardianproject/SecureSmartCam/commit/d9d199e5c84eb4812158637c6d62f42b1c348c32
  Author: LvH <LvH at VIDEOCLASH-2.local>
  Date:   2011-10-13 (Thu, 13 Oct 2011)

  Changed paths:
    M .classpath
    M AndroidManifest.xml
    A jni/README.md
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.cpp
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.h
    A libs/armeabi/libJpegRedaction.so
    A libs/armeabi/libdatabase_sqlcipher.so
    A libs/armeabi/libsqlcipher.so
    A libs/armeabi/libsqlcipher_android-10.so
    A libs/armeabi/libsqlcipher_android-11.so
    A libs/armeabi/libsqlcipher_android-12.so
    A libs/armeabi/libsqlcipher_android-13.so
    A libs/armeabi/libsqlcipher_android-7.so
    A libs/armeabi/libsqlcipher_android-8.so
    A libs/armeabi/libsqlcipher_android-9.so
    A libs/armeabi/libsqlcipher_android.so
    A libs/armeabi/libstlport_shared.so
    A libs/commons-codec.jar
    A libs/guava-r09.jar
    A libs/sqlcipher.jar
    A res/anim/rail.xml
    M res/layout/action_item.xml
    R res/layout/encrypttagger.xml
    R res/layout/idtagger.xml
    R res/layout/imageprefs.xml
    A res/layout/informa_options.xml
    A res/layout/informaeditor.xml
    M res/values/strings.xml
    M res/xml/preferences.xml
    M src/net/londatiga/android/ActionItem.java
    A src/net/londatiga/android/PopupWindows.java
    M src/net/londatiga/android/QuickAction.java
    A src/org/witness/informa/InformaEditor.java
    A src/org/witness/informa/SensorSucker.java
    A src/org/witness/informa/utils/InformaOptions.java
    A src/org/witness/informa/utils/InformaOptionsAdapter.java
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/securesmartcam/filters/BlurObscure.java
    A src/org/witness/securesmartcam/filters/ConsentTagger.java
    R src/org/witness/securesmartcam/filters/CrowdBlurObscure.java
    A src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java
    M src/org/witness/securesmartcam/filters/MaskObscure.java
    R src/org/witness/securesmartcam/filters/ObscureMethod.java
    M src/org/witness/securesmartcam/filters/PaintSquareObscure.java
    M src/org/witness/securesmartcam/filters/PixelizeObscure.java
    A src/org/witness/securesmartcam/filters/RegionProcesser.java
    A src/org/witness/securesmartcam/filters/TintObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

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

Conflicts:
	AndroidManifest.xml


  Commit: 8c2e44c5dbb0b7123cbb327b436bb2ad205b07d5
      https://github.com/guardianproject/SecureSmartCam/commit/8c2e44c5dbb0b7123cbb327b436bb2ad205b07d5
  Author: LvH <LvH at VIDEOCLASH-2.local>
  Date:   2011-10-13 (Thu, 13 Oct 2011)

  Changed paths:
    A res/drawable/border_idtag.9.png
    M src/org/witness/informa/InformaEditor.java
    R src/org/witness/informa/SensorSucker.java
    A src/org/witness/informa/utils/ExifModifier.java
    A src/org/witness/informa/utils/SensorSucker.java
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/securesmartcam/filters/ConsentTagger.java
    R src/org/witness/sscphase1/ImageEditor.java
    A src/org/witness/wit/MetadataParser.java

  Log Message:
  -----------
  Further intergration of Informa, including an Exif Modification class and a metadata parser.  ImageRegions with "identify" now get a different border in "normal mode."


  Commit: 6840b3e0071ec958382e038cf316a3367d7b57a6
      https://github.com/guardianproject/SecureSmartCam/commit/6840b3e0071ec958382e038cf316a3367d7b57a6
  Author: LvH <LvH at VIDEOCLASH-2.local>
  Date:   2011-10-13 (Thu, 13 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  updating UI


  Commit: 5f39962bada3273e76f75de83ddeac04c6419fbc
      https://github.com/guardianproject/SecureSmartCam/commit/5f39962bada3273e76f75de83ddeac04c6419fbc
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-13 (Thu, 13 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/sscphase1/ObscuraApp.java

  Log Message:
  -----------
  changes related to save/delete of images from camera


  Commit: 673bd019c4921dad53caa3b1c861c56ad9f1d419
      https://github.com/guardianproject/SecureSmartCam/commit/673bd019c4921dad53caa3b1c861c56ad9f1d419
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-14 (Fri, 14 Oct 2011)

  Changed paths:
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.cpp

  Log Message:
  -----------
  added full exif/metdata removal in native


  Commit: c25a3649223b90ade9f5447f1ada2ebf3efe942b
      https://github.com/guardianproject/SecureSmartCam/commit/c25a3649223b90ade9f5447f1ada2ebf3efe942b
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-14 (Fri, 14 Oct 2011)

  Changed paths:
    M libs/armeabi/libJpegRedaction.so

  Log Message:
  -----------
  new binary version of native lib


  Commit: 634247f314561642e5de02a3066fa45a165e1283
      https://github.com/guardianproject/SecureSmartCam/commit/634247f314561642e5de02a3066fa45a165e1283
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-14 (Fri, 14 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  added in debug() method for cleaner logging


  Commit: 923aaf71fbc83b34ccde9850064b72ffb2dab879
      https://github.com/guardianproject/SecureSmartCam/commit/923aaf71fbc83b34ccde9850064b72ffb2dab879
  Author: LvH <LvH at VIDEOCLASH-2.local>
  Date:   2011-10-17 (Mon, 17 Oct 2011)

  Changed paths:
    M res/values/strings.xml
    M src/org/witness/informa/InformaEditor.java
    A src/org/witness/informa/InformaOptions.java
    M src/org/witness/informa/utils/ExifModifier.java
    R src/org/witness/informa/utils/InformaOptions.java
    R src/org/witness/informa/utils/InformaOptionsAdapter.java
    A src/org/witness/informa/utils/MetadataParser.java
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/securesmartcam/filters/BlurObscure.java
    M src/org/witness/securesmartcam/filters/ConsentTagger.java
    M src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java
    M src/org/witness/securesmartcam/filters/MaskObscure.java
    M src/org/witness/securesmartcam/filters/PaintSquareObscure.java
    M src/org/witness/securesmartcam/filters/PixelizeObscure.java
    M src/org/witness/securesmartcam/filters/RegionProcesser.java
    M src/org/witness/securesmartcam/filters/TintObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java
    R src/org/witness/wit/MetadataParser.java

  Log Message:
  -----------
  Informa now logs imageRegion metadata, and inserts human-readable consent data into Exif Make tag


  Commit: 903f931787bfa8b4326fcb2fcc2116808cfbc128
      https://github.com/guardianproject/SecureSmartCam/commit/903f931787bfa8b4326fcb2fcc2116808cfbc128
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/securesmartcam/detect/GoogleFaceDetection.java
    M src/org/witness/securesmartcam/filters/BlurObscure.java
    M src/org/witness/securesmartcam/filters/ConsentTagger.java
    M src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java
    M src/org/witness/securesmartcam/filters/MaskObscure.java
    M src/org/witness/securesmartcam/filters/PaintSquareObscure.java
    M src/org/witness/securesmartcam/filters/PixelizeObscure.java
    M src/org/witness/securesmartcam/filters/RegionProcesser.java
    M src/org/witness/securesmartcam/filters/TintObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

  Log Message:
  -----------
  UI and filter updates


  Commit: ffb929a4c494cebace7b64b1ae61c99fcfd75ddf
      https://github.com/guardianproject/SecureSmartCam/commit/ffb929a4c494cebace7b64b1ae61c99fcfd75ddf
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M res/layout/imageregioninner.xml
    M res/layout/imageviewer.xml

  Log Message:
  -----------
  changes to layout


  Commit: 1bc0142a5cccc15e6871275dcebfefc802e8cee1
      https://github.com/guardianproject/SecureSmartCam/commit/1bc0142a5cccc15e6871275dcebfefc802e8cee1
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated build version


  Commit: 11301926922adcd65c8c7768a55c3b3096f395ef
      https://github.com/guardianproject/SecureSmartCam/commit/11301926922adcd65c8c7768a55c3b3096f395ef
  Author: Harlo Holmes <harlo.holmes at gmail.com>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    A doc/spec/informaCam_specification_phase-ii.doc.docx
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/filters/BlurObscure.java
    M src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java
    M src/org/witness/securesmartcam/filters/MaskObscure.java
    M src/org/witness/securesmartcam/filters/PaintSquareObscure.java
    M src/org/witness/securesmartcam/filters/PixelizeObscure.java
    M src/org/witness/securesmartcam/filters/TintObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

  Log Message:
  -----------
  some minor clean up, plus stub for our spec (now in the docs folder.)


  Commit: 7676c51748d4f42a33250e53868018f9258d8f4f
      https://github.com/guardianproject/SecureSmartCam/commit/7676c51748d4f42a33250e53868018f9258d8f4f
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-19 (Wed, 19 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  initial fixes for region moving and resizing


  Commit: 0a911729269651e0fadcfe997c3a37f3067e8384
      https://github.com/guardianproject/SecureSmartCam/commit/0a911729269651e0fadcfe997c3a37f3067e8384
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-19 (Wed, 19 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  fixes matrix offset on region, and auto render after add


  Commit: 26bae8fefcc3cd98ce95f78a2e12f1beb9122c55
      https://github.com/guardianproject/SecureSmartCam/commit/26bae8fefcc3cd98ce95f78a2e12f1beb9122c55
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-19 (Wed, 19 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  fixes selection of regions


  Commit: 52683ca78d32b84aff37a60d846bee64e7d74c9f
      https://github.com/guardianproject/SecureSmartCam/commit/52683ca78d32b84aff37a60d846bee64e7d74c9f
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-19 (Wed, 19 Oct 2011)

  Changed paths:
    M res/layout/imageviewer.xml

  Log Message:
  -----------
  removed unnecessary relativelayout view


  Commit: 5d15177047e99fa78f3c91dd6ad6418a66df7e59
      https://github.com/guardianproject/SecureSmartCam/commit/5d15177047e99fa78f3c91dd6ad6418a66df7e59
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-19 (Wed, 19 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  fixed drag, resize and onClick for popup menu


  Commit: 398534f8f218e27e98d5f09cd475ff58610ecf77
      https://github.com/guardianproject/SecureSmartCam/commit/398534f8f218e27e98d5f09cd475ff58610ecf77
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-19 (Wed, 19 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  very very close, but not totally there


  Commit: c5104ed4212742c2ff9fd98699df694fa80dcc22
      https://github.com/guardianproject/SecureSmartCam/commit/c5104ed4212742c2ff9fd98699df694fa80dcc22
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-20 (Thu, 20 Oct 2011)

  Changed paths:
    M res/layout/imageviewer.xml

  Log Message:
  -----------
  added on screen buttons for menu options


  Commit: f9228ddfdc53ed914139ab3d7fc0e85dba948e50
      https://github.com/guardianproject/SecureSmartCam/commit/f9228ddfdc53ed914139ab3d7fc0e85dba948e50
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-20 (Thu, 20 Oct 2011)

  Changed paths:
    M src/net/londatiga/android/QuickAction.java

  Log Message:
  -----------
  removed up/down arrows from quick actions popup


  Commit: 5a4499e13fb76d963de23e1ebc40f767ea51f0d4
      https://github.com/guardianproject/SecureSmartCam/commit/5a4499e13fb76d963de23e1ebc40f767ea51f0d4
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-20 (Thu, 20 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  more fixes for region positioning and resizing


  Commit: 758ba5b1d03cabe2d1d3bb5a83cee4f4495be959
      https://github.com/guardianproject/SecureSmartCam/commit/758ba5b1d03cabe2d1d3bb5a83cee4f4495be959
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-20 (Thu, 20 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  fixed random region collapsing on resize


  Commit: 2b8f5f9af090fa54080295445b7c43c88b3b2982
      https://github.com/guardianproject/SecureSmartCam/commit/2b8f5f9af090fa54080295445b7c43c88b3b2982
  Author: Derek Halliday <halliday at gmail.com>
  Date:   2011-10-20 (Thu, 20 Oct 2011)

  Changed paths:
    A res/drawable-hdpi/btn_new_region_pressed.png
    A res/drawable-hdpi/btn_new_region_unpressed.png
    A res/drawable-hdpi/btn_preview_pressed.png
    A res/drawable-hdpi/btn_preview_unpressed.png
    A res/drawable-hdpi/btn_save_pressed.png
    A res/drawable-hdpi/btn_save_unpressed.png
    A res/drawable-hdpi/btn_share_pressed.png
    A res/drawable-hdpi/btn_share_unpressed.png
    A res/drawable/btn_new_region.xml
    A res/drawable/btn_preview.xml
    A res/drawable/btn_save.xml
    A res/drawable/btn_share.xml
    M res/layout/imageviewer.xml

  Log Message:
  -----------
  updated layout of on-screen menu items


  Commit: 39a6f83517ddb0293cae9a9a7c865c041ace3a94
      https://github.com/guardianproject/SecureSmartCam/commit/39a6f83517ddb0293cae9a9a7c865c041ace3a94
  Author: Derek Halliday <halliday at gmail.com>
  Date:   2011-10-20 (Thu, 20 Oct 2011)

  Changed paths:
    A res/drawable-hdpi/btn_new_region_pressed.png
    A res/drawable-hdpi/btn_new_region_unpressed.png
    A res/drawable-hdpi/btn_preview_pressed.png
    A res/drawable-hdpi/btn_preview_unpressed.png
    A res/drawable-hdpi/btn_save_pressed.png
    A res/drawable-hdpi/btn_save_unpressed.png
    A res/drawable-hdpi/btn_share_pressed.png
    A res/drawable-hdpi/btn_share_unpressed.png
    A res/drawable/btn_new_region.xml
    A res/drawable/btn_preview.xml
    A res/drawable/btn_save.xml
    A res/drawable/btn_share.xml
    M res/layout/imageviewer.xml

  Log Message:
  -----------
  Merge branch 'workingbranch' into obscurav1


  Commit: 26a258b79dfd6b0fac5fb8792dca9707f95bcc1a
      https://github.com/guardianproject/SecureSmartCam/commit/26a258b79dfd6b0fac5fb8792dca9707f95bcc1a
  Author: Derek Halliday <halliday at gmail.com>
  Date:   2011-10-20 (Thu, 20 Oct 2011)

  Changed paths:
    M res/drawable-hdpi/btn_save_unpressed.png
    M res/drawable-hdpi/btn_share_unpressed.png

  Log Message:
  -----------
  fixed one minor btn design nit


  Commit: 116d4bf003734e088faa8ee1fc46e121a16e74c1
      https://github.com/guardianproject/SecureSmartCam/commit/116d4bf003734e088faa8ee1fc46e121a16e74c1
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-21 (Fri, 21 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  added in corner dragging of regions


  Commit: 7444d76eb8101fa8b964e6b0f47de48e661d586a
      https://github.com/guardianproject/SecureSmartCam/commit/7444d76eb8101fa8b964e6b0f47de48e661d586a
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-21 (Fri, 21 Oct 2011)

  Changed paths:
    M .classpath

  Log Message:
  -----------
  nothing to see here


  Commit: fcdec2c9eaa00ebbcdf52990ea39b8b65757208e
      https://github.com/guardianproject/SecureSmartCam/commit/fcdec2c9eaa00ebbcdf52990ea39b8b65757208e
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-21 (Fri, 21 Oct 2011)

  Changed paths:
    M .classpath
    M AndroidManifest.xml
    A doc/spec/informaCam_specification_phase-ii.doc.docx
    A libs/armeabi/libdatabase_sqlcipher.so
    A libs/armeabi/libsqlcipher.so
    A libs/armeabi/libsqlcipher_android-10.so
    A libs/armeabi/libsqlcipher_android-11.so
    A libs/armeabi/libsqlcipher_android-12.so
    A libs/armeabi/libsqlcipher_android-13.so
    A libs/armeabi/libsqlcipher_android-7.so
    A libs/armeabi/libsqlcipher_android-8.so
    A libs/armeabi/libsqlcipher_android-9.so
    A libs/armeabi/libsqlcipher_android.so
    A libs/armeabi/libstlport_shared.so
    A libs/commons-codec.jar
    A libs/guava-r09.jar
    A libs/sqlcipher.jar
    A res/drawable/border_idtag.9.png
    R res/layout/encrypttagger.xml
    R res/layout/idtagger.xml
    R res/layout/imageprefs.xml
    A res/layout/informa_options.xml
    A res/layout/informaeditor.xml
    M res/values/strings.xml
    M res/xml/preferences.xml
    A src/org/witness/informa/InformaEditor.java
    A src/org/witness/informa/InformaOptions.java
    A src/org/witness/informa/utils/ExifModifier.java
    A src/org/witness/informa/utils/MetadataParser.java
    A src/org/witness/informa/utils/SensorSucker.java
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/securesmartcam/filters/BlurObscure.java
    M src/org/witness/securesmartcam/filters/ConsentTagger.java
    M src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java
    M src/org/witness/securesmartcam/filters/MaskObscure.java
    M src/org/witness/securesmartcam/filters/PaintSquareObscure.java
    M src/org/witness/securesmartcam/filters/PixelizeObscure.java
    M src/org/witness/securesmartcam/filters/RegionProcesser.java
    M src/org/witness/securesmartcam/filters/TintObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

  Log Message:
  -----------
  Merge branch 'informav1' into obscurav1

Conflicts:
	.classpath
	src/org/witness/securesmartcam/ImageEditor.java
	src/org/witness/securesmartcam/ImageRegion.java
	src/org/witness/securesmartcam/filters/BlurObscure.java
	src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java
	src/org/witness/securesmartcam/filters/PaintSquareObscure.java
	src/org/witness/securesmartcam/filters/TintObscure.java
	src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java


  Commit: f819337d75def71324138c5b94249d9f64aa3796
      https://github.com/guardianproject/SecureSmartCam/commit/f819337d75def71324138c5b94249d9f64aa3796
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-21 (Fri, 21 Oct 2011)

  Changed paths:
    M AndroidManifest.xml
    R libs/armeabi/libJpegRedaction.so
    R libs/armeabi/libdatabase_sqlcipher.so
    R libs/armeabi/libsqlcipher.so
    R libs/armeabi/libsqlcipher_android-10.so
    R libs/armeabi/libsqlcipher_android-11.so
    R libs/armeabi/libsqlcipher_android-12.so
    R libs/armeabi/libsqlcipher_android-13.so
    R libs/armeabi/libsqlcipher_android-7.so
    R libs/armeabi/libsqlcipher_android-8.so
    R libs/armeabi/libsqlcipher_android-9.so
    R libs/armeabi/libsqlcipher_android.so
    R libs/armeabi/libstlport_shared.so
    R libs/sqlcipher.jar

  Log Message:
  -----------
  removing sqlcipher for now


  Commit: f0bd0bff30fd115ce5bd6e56d634f157b548caa0
      https://github.com/guardianproject/SecureSmartCam/commit/f0bd0bff30fd115ce5bd6e56d634f157b548caa0
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-21 (Fri, 21 Oct 2011)

  Changed paths:
    M res/layout/informaeditor.xml
    M src/org/witness/informa/InformaEditor.java

  Log Message:
  -----------
  removed persist/remember feature in identify dialog


  Commit: cbd1cedf86f3ea2a5cf4106730c14e5cd75bcd39
      https://github.com/guardianproject/SecureSmartCam/commit/cbd1cedf86f3ea2a5cf4106730c14e5cd75bcd39
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-23 (Sun, 23 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  small to change to handling touch down with multiple regions


  Commit: 5cc30083b8437f6ff916a5a0cc8af615ed8dc9db
      https://github.com/guardianproject/SecureSmartCam/commit/5cc30083b8437f6ff916a5a0cc8af615ed8dc9db
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-23 (Sun, 23 Oct 2011)

  Changed paths:
    M res/layout/informa_options.xml
    M res/layout/informaeditor.xml
    M src/org/witness/informa/InformaEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  tweaked informa/identify dialog and made persistence work


  Commit: 78a2d6ab409cb7756781098f1958bc8c55d50fa1
      https://github.com/guardianproject/SecureSmartCam/commit/78a2d6ab409cb7756781098f1958bc8c55d50fa1
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    R src/org/witness/securesmartcam/filters/PaintSquareObscure.java
    A src/org/witness/securesmartcam/filters/SolidObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

  Log Message:
  -----------
  fixes to native redact and integration with Exif/Metadata exporter


  Commit: 9dea7543ffa5443a42c873128ac3464f8bfb52d7
      https://github.com/guardianproject/SecureSmartCam/commit/9dea7543ffa5443a42c873128ac3464f8bfb52d7
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    A libs/armeabi/libJpegRedaction.so

  Log Message:
  -----------
  update to native lib


  Commit: 5e103303ebaa3f90cc2ff89b82e36ebc7b73b506
      https://github.com/guardianproject/SecureSmartCam/commit/5e103303ebaa3f90cc2ff89b82e36ebc7b73b506
  Author: LvH <LvH at VIDEOCLASH-2.local>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M doc/spec/informaCam_specification_phase-ii.doc.docx
    M res/layout/informaeditor.xml
    M src/org/witness/informa/InformaEditor.java
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/filters/BlurObscure.java
    M src/org/witness/securesmartcam/filters/ConsentTagger.java
    M src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java
    M src/org/witness/securesmartcam/filters/MaskObscure.java
    M src/org/witness/securesmartcam/filters/PixelizeObscure.java
    M src/org/witness/securesmartcam/filters/RegionProcesser.java
    M src/org/witness/securesmartcam/filters/SolidObscure.java
    M src/org/witness/securesmartcam/filters/TintObscure.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

  Log Message:
  -----------
  updating for image preview in InformaEditor.  As it is now, still buggy/unseemly


  Commit: 3446b8bba092626379dfbb46014ff561f2ade862
      https://github.com/guardianproject/SecureSmartCam/commit/3446b8bba092626379dfbb46014ff561f2ade862
  Author: LvH <LvH at VIDEOCLASH-2.local>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M src/org/witness/informa/InformaEditor.java
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  image preview for InformaEditor now online.


  Commit: 433653b1efe3e1ecefac731cc93fc2a58e6bf34f
      https://github.com/guardianproject/SecureSmartCam/commit/433653b1efe3e1ecefac731cc93fc2a58e6bf34f
  Author: LvH <LvH at VIDEOCLASH-2.local>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M res/values/strings.xml
    M src/org/witness/informa/InformaEditor.java
    M src/org/witness/informa/utils/MetadataParser.java
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/filters/ConsentTagger.java

  Log Message:
  -----------
  minor fix.


  Commit: dde141833199b211e3708095a235eb0650cf8483
      https://github.com/guardianproject/SecureSmartCam/commit/dde141833199b211e3708095a235eb0650cf8483
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/securesmartcam/filters/ConsentTagger.java

  Log Message:
  -----------
  fixes deselect/new region bug; improves corner dragging detection


  Commit: 6ead24d8cefd68d8ed46c966e32ac793fe5951c7
      https://github.com/guardianproject/SecureSmartCam/commit/6ead24d8cefd68d8ed46c966e32ac793fe5951c7
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M BUILD
    M CHANGELOG
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.cpp
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.h

  Log Message:
  -----------
  minor updates to project text and JNI libs


  Commit: 4834dc7a847d41d0c2bc3d984ac1688995515e11
      https://github.com/guardianproject/SecureSmartCam/commit/4834dc7a847d41d0c2bc3d984ac1688995515e11
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  fixes long click vibrate - remove onLongClick etc - closes #85


  Commit: eeaeac9f2daef15565d15445b508cc11e966e38a
      https://github.com/guardianproject/SecureSmartCam/commit/eeaeac9f2daef15565d15445b508cc11e966e38a
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    A assets/EULA
    M res/values/strings.xml
    A src/org/witness/sscphase1/Eula.java
    M src/org/witness/sscphase1/ObscuraApp.java

  Log Message:
  -----------
  adding in EULA with UI dialog. closes #40.


  Commit: c2b326b9be0c60d325900c36de43aee2c3984e3f
      https://github.com/guardianproject/SecureSmartCam/commit/c2b326b9be0c60d325900c36de43aee2c3984e3f
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  regions cannot be resized into negative now. fixes #80.


  Commit: 78699e1b996cc425132408fedd906bbc57e8c843
      https://github.com/guardianproject/SecureSmartCam/commit/78699e1b996cc425132408fedd906bbc57e8c843
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    A res/drawable/gradient.xml
    M res/layout/imageviewer.xml

  Log Message:
  -----------
  added slight gradient to window background


  Commit: 562b0c5f90289c37139ca9cae3b9ef7efd5d97c0
      https://github.com/guardianproject/SecureSmartCam/commit/562b0c5f90289c37139ca9cae3b9ef7efd5d97c0
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  added spinning progress dialog and asynctask for face detect


  Commit: a64f59ef93e0612d24268ec6a4821cdce5610d2f
      https://github.com/guardianproject/SecureSmartCam/commit/a64f59ef93e0612d24268ec6a4821cdce5610d2f
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  rotation now works mostly. had to add a timedelay in updating screen inside onConfigChange. Fixes #52.


  Commit: c2eef155bad59a418b7ad3fa8a845efb3afbe1a3
      https://github.com/guardianproject/SecureSmartCam/commit/c2eef155bad59a418b7ad3fa8a845efb3afbe1a3
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated for v1.2-RC1


  Commit: c33489bed437f63db36f22d087aea2fd81f8b731
      https://github.com/guardianproject/SecureSmartCam/commit/c33489bed437f63db36f22d087aea2fd81f8b731
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  actually RC2!


  Commit: 7239abbdf8534c68417c251652b2564285dbb6ae
      https://github.com/guardianproject/SecureSmartCam/commit/7239abbdf8534c68417c251652b2564285dbb6ae
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.cpp

  Log Message:
  -----------
  updating redactRegions code for native processing

added new debug messages
properly support the string command for multiple
regions at once


  Commit: d5b2f65cfe7e27d61b72e7fc7c057baec6380079
      https://github.com/guardianproject/SecureSmartCam/commit/d5b2f65cfe7e27d61b72e7fc7c057baec6380079
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

  Log Message:
  -----------
  properly support redactRegions native/multi mode


  Commit: 8815b0835cf8c9acbc00c44421544904915f5c5b
      https://github.com/guardianproject/SecureSmartCam/commit/8815b0835cf8c9acbc00c44421544904915f5c5b
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  improvements on save/processing using native lib

new code for saving from gallery URI to a file
now loads directly from source URI instead of
copying to yet another local tmp file


  Commit: f87b07925cb224a3171d68805d3a46ed7718d651
      https://github.com/guardianproject/SecureSmartCam/commit/f87b07925cb224a3171d68805d3a46ed7718d651
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M src/org/witness/securesmartcam/filters/BlurObscure.java
    A src/org/witness/securesmartcam/filters/ConvolutionMatrix.java
    A src/org/witness/securesmartcam/filters/CrowdBlurObscure.java
    M src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java

  Log Message:
  -----------
  working on blur


  Commit: ca60835e4971b358064296e0564afc50826bea65
      https://github.com/guardianproject/SecureSmartCam/commit/ca60835e4971b358064296e0564afc50826bea65
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M libs/armeabi/libJpegRedaction.so

  Log Message:
  -----------
  latest bin of redact lib


  Commit: 2b4cb688d86c028631bda4cc60a805493c596b89
      https://github.com/guardianproject/SecureSmartCam/commit/2b4cb688d86c028631bda4cc60a805493c596b89
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M src/org/witness/securesmartcam/ImageRegion.java

  Log Message:
  -----------
  support for blur obscure


  Commit: 53806c5b0f4bc3572c1501bdc9245ad140525aa1
      https://github.com/guardianproject/SecureSmartCam/commit/53806c5b0f4bc3572c1501bdc9245ad140525aa1
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    R default.properties

  Log Message:
  -----------
  we don't need this


  Commit: fa11e60f5ff7e6ae2be5a1864ff88328d4f57157
      https://github.com/guardianproject/SecureSmartCam/commit/fa11e60f5ff7e6ae2be5a1864ff88328d4f57157
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M .classpath

  Log Message:
  -----------
  small updates to classpath


  Commit: 87ea947b3d836f48d85bb9f2852a79a4e9f552e4
      https://github.com/guardianproject/SecureSmartCam/commit/87ea947b3d836f48d85bb9f2852a79a4e9f552e4
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-01-12 (Thu, 12 Jan 2012)

  Changed paths:
    M jni/Android.mk

  Log Message:
  -----------
  updated jni make file for new changes to asenior's lib


  Commit: 642e0f4798903ad2270af90a937cbf38dfcd5a0a
      https://github.com/guardianproject/SecureSmartCam/commit/642e0f4798903ad2270af90a937cbf38dfcd5a0a
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-01-12 (Thu, 12 Jan 2012)

  Changed paths:
    R res/drawable-hdpi/icon.png
    R res/drawable-mdpi/icon.png
    R res/drawable/icon.png

  Log Message:
  -----------
  new icon!


  Commit: ae62c6d8280cf0ba8c3a419fca23a3a12e86ddc9
      https://github.com/guardianproject/SecureSmartCam/commit/ae62c6d8280cf0ba8c3a419fca23a3a12e86ddc9
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-01-12 (Thu, 12 Jan 2012)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java
    M src/org/witness/sscphase1/ObscuraApp.java

  Log Message:
  -----------
  fixed issues related to saving native image


  Commit: 96257347cca11fb7e63947785e461a0b6e8c65b3
      https://github.com/guardianproject/SecureSmartCam/commit/96257347cca11fb7e63947785e461a0b6e8c65b3
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-01-12 (Thu, 12 Jan 2012)

  Changed paths:
    M libs/armeabi/libJpegRedaction.so

  Log Message:
  -----------
  new jpeg redact library binary


  Commit: 5170d9f3c08037044f2b53f8079e3f20a6954ea1
      https://github.com/guardianproject/SecureSmartCam/commit/5170d9f3c08037044f2b53f8079e3f20a6954ea1
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-01-12 (Thu, 12 Jan 2012)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated version


  Commit: 3fb307a42a70b91e80f650f0993185e18b9c5046
      https://github.com/guardianproject/SecureSmartCam/commit/3fb307a42a70b91e80f650f0993185e18b9c5046
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-01-12 (Thu, 12 Jan 2012)

  Changed paths:
    M proguard.cfg

  Log Message:
  -----------
  proguard!


  Commit: 76206ad0b3ba170c962865d938ad09900f6fd706
      https://github.com/guardianproject/SecureSmartCam/commit/76206ad0b3ba170c962865d938ad09900f6fd706
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated version


  Commit: 52007c1c6b50c33a1996208f63bbf210e31e21a8
      https://github.com/guardianproject/SecureSmartCam/commit/52007c1c6b50c33a1996208f63bbf210e31e21a8
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    A src/org/witness/ssc/video/BinaryInstaller.java
    A src/org/witness/ssc/video/FFMPEGWrapper.java
    A src/org/witness/ssc/video/InOutPlayheadSeekBar.java
    A src/org/witness/ssc/video/ObscureRegion.java
    A src/org/witness/ssc/video/RegionBarArea.java
    A src/org/witness/ssc/video/ShellUtils.java
    A src/org/witness/ssc/video/VideoCam.java
    A src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  adding video package


  Commit: f436b359fd0f0527f27a446475b798481e03edea
      https://github.com/guardianproject/SecureSmartCam/commit/f436b359fd0f0527f27a446475b798481e03edea
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    A res/drawable/edit_region_corner_ll.png
    A res/drawable/edit_region_corner_lr.png
    A res/drawable/edit_region_corner_ul.png
    A res/drawable/edit_region_corner_ur.png
    A res/drawable/leftthumb.png
    A res/drawable/rightthumb.png
    A res/drawable/testdrawable.xml
    M res/layout-land/mainmenu.xml
    R res/layout/main.xml
    M res/layout/mainmenu.xml
    A res/layout/video_camera_view.xml
    A res/layout/videoeditor.xml
    A res/raw/ffmpeg
    M res/values/strings.xml

  Log Message:
  -----------
  adding new resources for video


  Commit: 98f2e19c60a77423e3ad8a5b2f3d334c798cb6ba
      https://github.com/guardianproject/SecureSmartCam/commit/98f2e19c60a77423e3ad8a5b2f3d334c798cb6ba
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M src/org/witness/sscphase1/ObscuraApp.java

  Log Message:
  -----------
  modified for select video button


  Commit: 4422336fab7a50b961f107efda5a35b759488df5
      https://github.com/guardianproject/SecureSmartCam/commit/4422336fab7a50b961f107efda5a35b759488df5
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    A project.properties

  Log Message:
  -----------
  adding project file


  Commit: 97c2485e2bd124eac80320baba7b02ec6e673058
      https://github.com/guardianproject/SecureSmartCam/commit/97c2485e2bd124eac80320baba7b02ec6e673058
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated version for v2 with video


  Commit: b02d194465ba8463c0efe8188dcb208e4c4c05f1
      https://github.com/guardianproject/SecureSmartCam/commit/b02d194465ba8463c0efe8188dcb208e4c4c05f1
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M src/org/witness/ssc/video/ObscureRegion.java

  Log Message:
  -----------
  increased default region size to 150


  Commit: a4046640a4bb0c83cbfa3453cfb244b67166d1eb
      https://github.com/guardianproject/SecureSmartCam/commit/a4046640a4bb0c83cbfa3453cfb244b67166d1eb
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  improved progress dialog


  Commit: 8a8759f0066a8897421da6a5e7551a6f90ec1ba7
      https://github.com/guardianproject/SecureSmartCam/commit/8a8759f0066a8897421da6a5e7551a6f90ec1ba7
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    A res/menu/video_editor_menu.xml

  Log Message:
  -----------
  added video menu


  Commit: d9883d7a7a8edf4287112ed76a92b70395d9021d
      https://github.com/guardianproject/SecureSmartCam/commit/d9883d7a7a8edf4287112ed76a92b70395d9021d
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  moved facedetect to Thread instead of slooow AsyncTask


  Commit: db4b1af0fccf2002931aefac4514b43bc65f2d30
      https://github.com/guardianproject/SecureSmartCam/commit/db4b1af0fccf2002931aefac4514b43bc65f2d30
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M src/org/witness/ssc/video/ObscureRegion.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  added video autodetect


  Commit: 2992dd35b21163f1e210deca3c089bc2f3dc3be3
      https://github.com/guardianproject/SecureSmartCam/commit/2992dd35b21163f1e210deca3c089bc2f3dc3be3
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M project.properties

  Log Message:
  -----------
  updated target version


  Commit: b331e8a96cb7707382bc91fea09223011015671a
      https://github.com/guardianproject/SecureSmartCam/commit/b331e8a96cb7707382bc91fea09223011015671a
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M res/layout-land/mainmenu.xml
    M res/layout/mainmenu.xml
    M res/layout/videoeditor.xml
    M res/menu/video_editor_menu.xml
    M res/values/strings.xml

  Log Message:
  -----------
  updated layouts and menus


  Commit: b3c888df63095b9808fec3667f30519fc5ec59c7
      https://github.com/guardianproject/SecureSmartCam/commit/b3c888df63095b9808fec3667f30519fc5ec59c7
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M src/org/witness/ssc/video/FFMPEGWrapper.java

  Log Message:
  -----------
  began wrapping FFMPEG a bit more with some variables


  Commit: 3aec0c0ad214cde1ee3ee58315838e6793fd3f04
      https://github.com/guardianproject/SecureSmartCam/commit/3aec0c0ad214cde1ee3ee58315838e6793fd3f04
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M src/org/witness/ssc/video/ObscureRegion.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  added auto-face detect and improved region rendering


  Commit: 2040109a5020ad2e686dc5a9dd802bb58dcbbf7a
      https://github.com/guardianproject/SecureSmartCam/commit/2040109a5020ad2e686dc5a9dd802bb58dcbbf7a
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M AndroidManifest.xml
    M project.properties

  Log Message:
  -----------
  added support for ActionBar


  Commit: b804e9cf8491ee90ae7b474e8381b809d54d8846
      https://github.com/guardianproject/SecureSmartCam/commit/b804e9cf8491ee90ae7b474e8381b809d54d8846
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    A res/drawable-hdpi/ic_video.png
    A res/menu-v11/image_editor_menu.xml
    A res/menu-v11/main_menu.xml
    A res/menu-v11/video_editor_menu.xml

  Log Message:
  -----------
  new menus for ICS and Honeycomb


  Commit: 03fa17de215fda0eb2f92c9e68821571a9c83d63
      https://github.com/guardianproject/SecureSmartCam/commit/03fa17de215fda0eb2f92c9e68821571a9c83d63
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M res/layout-land/mainmenu.xml
    M res/layout/mainmenu.xml

  Log Message:
  -----------
  updated main screen layout


  Commit: 9320ae8dbb3d1c545de6c0591774bc558dfc6aae
      https://github.com/guardianproject/SecureSmartCam/commit/9320ae8dbb3d1c545de6c0591774bc558dfc6aae
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    A res/drawable/bg.jpg

  Log Message:
  -----------
  added new bg image


  Commit: dc5898259cf828f10f4411215e63e0648237290f
      https://github.com/guardianproject/SecureSmartCam/commit/dc5898259cf828f10f4411215e63e0648237290f
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M res/layout/mainmenu.xml

  Log Message:
  -----------
  updated bg image


  Commit: 6b658c5f13b941b4f2a3b1308a14666d825a10ad
      https://github.com/guardianproject/SecureSmartCam/commit/6b658c5f13b941b4f2a3b1308a14666d825a10ad
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M src/org/witness/ssc/video/FFMPEGWrapper.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  tuned scrubbing, and region display


  Commit: 56b9ec444ba91070ed7692e0f0983f705427afa7
      https://github.com/guardianproject/SecureSmartCam/commit/56b9ec444ba91070ed7692e0f0983f705427afa7
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    A res/drawable-mdpi/bg.jpg
    M res/drawable/bg.jpg
    A res/drawable/oldsscbg.jpg
    R res/drawable/sscbg.jpg
    M res/layout-land/mainmenu.xml
    M res/layout-land/splashscreen.xml
    M res/layout/mainloading.xml
    M res/layout/mainmenu.xml
    M res/layout/splashscreen.xml
    M res/layout/walkthrough.xml

  Log Message:
  -----------
  new background and layout tweaks


  Commit: 0b57aab26f952e916b3ae82772a828598d24f7da
      https://github.com/guardianproject/SecureSmartCam/commit/0b57aab26f952e916b3ae82772a828598d24f7da
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  small tweak to manual mode


  Commit: d671c9bd32927d25fbca11c879089db5c1957288
      https://github.com/guardianproject/SecureSmartCam/commit/d671c9bd32927d25fbca11c879089db5c1957288
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    A res/xml/videopreferences.xml
    A src/org/witness/ssc/video/VideoPreferences.java

  Log Message:
  -----------
  adding video output preferences


  Commit: f8fa094dccc3d0c33350f19889146c4917ddd4fb
      https://github.com/guardianproject/SecureSmartCam/commit/f8fa094dccc3d0c33350f19889146c4917ddd4fb
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M res/menu-v11/video_editor_menu.xml
    M res/menu/video_editor_menu.xml

  Log Message:
  -----------
  added preferences option to video menu


  Commit: 05359a955f5ccd344da477f469998a1a4a4181c0
      https://github.com/guardianproject/SecureSmartCam/commit/05359a955f5ccd344da477f469998a1a4a4181c0
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M .classpath
    M AndroidManifest.xml
    M project.properties
    M src/org/witness/ssc/video/FFMPEGWrapper.java
    M src/org/witness/ssc/video/VideoEditor.java
    M src/org/witness/sscphase1/ObscuraApp.java

  Log Message:
  -----------
  updated project files and strings


  Commit: 0660e547b536079561cc3d39a4f44c4026b98bd1
      https://github.com/guardianproject/SecureSmartCam/commit/0660e547b536079561cc3d39a4f44c4026b98bd1
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M res/values/strings.xml

  Log Message:
  -----------
  updated strings


  Commit: ce3ffecc9ca7a291f4e151e74bf80dd29d806b12
      https://github.com/guardianproject/SecureSmartCam/commit/ce3ffecc9ca7a291f4e151e74bf80dd29d806b12
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M res/values/strings.xml

  Log Message:
  -----------
  added vheight preference


  Commit: 7085f35148b3e510c5b845908f1a996c7eb8e119
      https://github.com/guardianproject/SecureSmartCam/commit/7085f35148b3e510c5b845908f1a996c7eb8e119
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M res/xml/videopreferences.xml

  Log Message:
  -----------
  fixed preference key


  Commit: 6d3d0f72095f8b25fb8eec163547de9577b7dc85
      https://github.com/guardianproject/SecureSmartCam/commit/6d3d0f72095f8b25fb8eec163547de9577b7dc85
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  improvements to image editor region dragging


  Commit: 665857a21ee637da73d96aa8f965e2abd71b3b5f
      https://github.com/guardianproject/SecureSmartCam/commit/665857a21ee637da73d96aa8f965e2abd71b3b5f
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M res/anim/grow_from_bottomright_to_topleft.xml
    M res/anim/grow_from_topright_to_bottomleft.xml
    M res/anim/shrink_from_bottomleft_to_topright.xml
    M res/anim/shrink_from_topleft_to_bottomright.xml
    A res/drawable-hdpi/ic_accept.png
    A res/drawable-hdpi/ic_add.png
    A res/drawable-hdpi/ic_list_more.png
    A res/drawable-hdpi/ic_list_more_selected.png
    A res/drawable-hdpi/ic_up.png
    A res/drawable-hdpi/quickaction_arrow_down.png
    A res/drawable-hdpi/quickaction_arrow_up.png
    A res/drawable-hdpi/quickaction_bottom_frame.9.png
    A res/drawable-hdpi/quickaction_slider_background.png
    A res/drawable-hdpi/quickaction_slider_btn_normal.9.png
    A res/drawable-hdpi/quickaction_slider_btn_on.9.png
    A res/drawable-hdpi/quickaction_slider_btn_pressed.9.png
    A res/drawable-hdpi/quickaction_slider_btn_selected.9.png
    A res/drawable-hdpi/quickaction_slider_grip_left.png
    A res/drawable-hdpi/quickaction_slider_grip_right.png
    A res/drawable-hdpi/quickaction_top_frame.9.png
    A res/drawable-hdpi/quickcontact_drop_shadow.9.png
    A res/drawable-hdpi/textfield_default.9.png
    A res/drawable-mdpi/ic_accept.png
    A res/drawable-mdpi/ic_add.png
    A res/drawable-mdpi/ic_list_more.png
    A res/drawable-mdpi/ic_list_more_selected.png
    A res/drawable-mdpi/ic_up.png
    A res/drawable-mdpi/icon.png
    A res/drawable-mdpi/quickaction_arrow_down.png
    A res/drawable-mdpi/quickaction_arrow_up.png
    A res/drawable-mdpi/quickaction_bottom_frame.9.png
    A res/drawable-mdpi/quickaction_slider_background.png
    A res/drawable-mdpi/quickaction_slider_btn_normal.9.png
    A res/drawable-mdpi/quickaction_slider_btn_on.9.png
    A res/drawable-mdpi/quickaction_slider_btn_pressed.9.png
    A res/drawable-mdpi/quickaction_slider_btn_selected.9.png
    A res/drawable-mdpi/quickaction_slider_grip_left.png
    A res/drawable-mdpi/quickaction_slider_grip_right.png
    A res/drawable-mdpi/quickaction_top_frame.9.png
    A res/drawable-mdpi/textfield_default.9.png
    A res/drawable/quickaction_slider_btn.xml
    M res/layout/action_item.xml
    A res/layout/example1.xml
    A res/layout/example2.xml
    A res/layout/list.xml
    A res/layout/main.xml
    A res/layout/quickaction.xml
    R res/values/.svn/all-wcprops
    R res/values/.svn/entries
    R res/values/.svn/text-base/strings.xml.svn-base
    R res/values/.svn/text-base/styles.xml.svn-base
    M res/values/styles.xml
    M src/net/londatiga/android/ActionItem.java
    R src/net/londatiga/android/CustomPopupWindow.java
    M src/net/londatiga/android/QuickAction.java
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  new quick action popup menu


  Commit: 64506a6cbf4b2597577110bed48785a4d9fad29a
      https://github.com/guardianproject/SecureSmartCam/commit/64506a6cbf4b2597577110bed48785a4d9fad29a
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M res/layout/imageviewer.xml
    M res/layout/videoeditor.xml
    M res/menu-v11/image_editor_menu.xml
    M res/menu/image_editor_menu.xml

  Log Message:
  -----------
  updated layouts; made video scrubber bar taller


  Commit: e4edb9220a874b7124d1b96887b57a5debe80dcf
      https://github.com/guardianproject/SecureSmartCam/commit/e4edb9220a874b7124d1b96887b57a5debe80dcf
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    A src/org/witness/ssc/video/RegionTrail.java

  Log Message:
  -----------
  added region trail collection


  Commit: 213e8fc50e9e805aa7bbf5b674c17c5f7c2171a8
      https://github.com/guardianproject/SecureSmartCam/commit/213e8fc50e9e805aa7bbf5b674c17c5f7c2171a8
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  tweaked activity definitions


  Commit: f5f8e345f79399cdb45384921db95c69cb7abf6c
      https://github.com/guardianproject/SecureSmartCam/commit/f5f8e345f79399cdb45384921db95c69cb7abf6c
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M src/net/londatiga/android/QuickAction.java

  Log Message:
  -----------
  added new update to popup code; works on tablet now


  Commit: 08758d5a5d5b41eae1a159205a8aef9a046d1f2f
      https://github.com/guardianproject/SecureSmartCam/commit/08758d5a5d5b41eae1a159205a8aef9a046d1f2f
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M src/org/witness/ssc/video/FFMPEGWrapper.java
    M src/org/witness/ssc/video/InOutPlayheadSeekBar.java
    M src/org/witness/ssc/video/ObscureRegion.java
    M src/org/witness/ssc/video/RegionBarArea.java
    M src/org/witness/ssc/video/VideoCam.java
    M src/org/witness/ssc/video/VideoEditor.java
    M src/org/witness/ssc/video/VideoPreferences.java

  Log Message:
  -----------
  major video updates; basically works now


  Commit: 37af1316a9858c8eb231bb028f223c728a1dbbff
      https://github.com/guardianproject/SecureSmartCam/commit/37af1316a9858c8eb231bb028f223c728a1dbbff
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/securesmartcam/ImageRegion.java
    M src/org/witness/securesmartcam/SplashScreenActivity.java
    M src/org/witness/securesmartcam/filters/MaskObscure.java
    A src/org/witness/securesmartcam/filters/PicassoObscure.java
    M src/org/witness/sscphase1/ObscuraApp.java

  Log Message:
  -----------
  bug fixes on image; support for actionbar


  Commit: 402b364529fe98561fb1f31980c4b7368d34a753
      https://github.com/guardianproject/SecureSmartCam/commit/402b364529fe98561fb1f31980c4b7368d34a753
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M src/org/witness/ssc/video/FFMPEGWrapper.java
    M src/org/witness/ssc/video/ObscureRegion.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  fixes issues with scaling of obscure regions


  Commit: 301227a193135397c6fb9a57173e7f9bbabe9884
      https://github.com/guardianproject/SecureSmartCam/commit/301227a193135397c6fb9a57173e7f9bbabe9884
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M src/org/witness/ssc/video/FFMPEGWrapper.java
    M src/org/witness/ssc/video/ObscureRegion.java
    M src/org/witness/ssc/video/RegionTrail.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  proper time sorting of regions in trail now implemented


  Commit: 32841df23a88f61df1f87db056e3f1cf45f738cb
      https://github.com/guardianproject/SecureSmartCam/commit/32841df23a88f61df1f87db056e3f1cf45f738cb
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    R res/raw/ffmpeg

  Log Message:
  -----------
  removed plain resource


  Commit: 15dbb04dcdcc69a8152388f55dc9257fba622cb7
      https://github.com/guardianproject/SecureSmartCam/commit/15dbb04dcdcc69a8152388f55dc9257fba622cb7
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    A res/raw/ffmpeg.mp3

  Log Message:
  -----------
  ffmpeg with mp3 ext to stop compression


  Commit: 5d953d8bfe9527f475511dc40a6e4850e8030a06
      https://github.com/guardianproject/SecureSmartCam/commit/5d953d8bfe9527f475511dc40a6e4850e8030a06
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M res/layout-land/mainmenu.xml
    M res/layout/mainmenu.xml
    A src/org/witness/securesmartcam/AnimatedBlockView.java
    M src/org/witness/ssc/video/FFMPEGWrapper.java
    M src/org/witness/ssc/video/ObscureRegion.java
    M src/org/witness/ssc/video/RegionTrail.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  UI cleanup and polish; redact/pixel option in popup


  Commit: 4db6e4fadfeb02325f8ed5dc3b70b81ffc8d1e19
      https://github.com/guardianproject/SecureSmartCam/commit/4db6e4fadfeb02325f8ed5dc3b70b81ffc8d1e19
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated manifest


  Commit: 7ec661374926327fa813c9545ac31b4609621c42
      https://github.com/guardianproject/SecureSmartCam/commit/7ec661374926327fa813c9545ac31b4609621c42
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M res/layout/mainloading.xml

  Log Message:
  -----------
  removed old background image


  Commit: c2d6f27f5ad731c3f986c6e6ef6939ccd4368c8b
      https://github.com/guardianproject/SecureSmartCam/commit/c2d6f27f5ad731c3f986c6e6ef6939ccd4368c8b
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  improved scrubber and popup menu


  Commit: ef45513254ce89658e6e36d35d3be4bb0524e48d
      https://github.com/guardianproject/SecureSmartCam/commit/ef45513254ce89658e6e36d35d3be4bb0524e48d
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java
    M src/org/witness/ssc/video/RegionTrail.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  fixed region interaction and save file type ext


  Commit: 9b320e9d83db86b48bb0b6cdd9ae684b85f0e20e
      https://github.com/guardianproject/SecureSmartCam/commit/9b320e9d83db86b48bb0b6cdd9ae684b85f0e20e
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M src/org/witness/ssc/video/RegionTrail.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  fixed region mode rendering


  Commit: 83522bddcf0e1f9e50016bd718d268fa703a82a4
      https://github.com/guardianproject/SecureSmartCam/commit/83522bddcf0e1f9e50016bd718d268fa703a82a4
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  fix by harlo to help with activity state


  Commit: 666290f76a4fdddd0766214989f78c5e107ab759
      https://github.com/guardianproject/SecureSmartCam/commit/666290f76a4fdddd0766214989f78c5e107ab759
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M res/menu/video_editor_menu.xml

  Log Message:
  -----------
  updated menu to support new region create


  Commit: 85fdfd6317361f20f32c1b3e6e4ff8049a86fff1
      https://github.com/guardianproject/SecureSmartCam/commit/85fdfd6317361f20f32c1b3e6e4ff8049a86fff1
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M src/org/witness/securesmartcam/AnimatedBlockView.java

  Log Message:
  -----------
  updated our fun main screen easter egg


  Commit: a6a2a956a03f70f7ceebf001587ce6fbaaadface
      https://github.com/guardianproject/SecureSmartCam/commit/a6a2a956a03f70f7ceebf001587ce6fbaaadface
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M src/org/witness/securesmartcam/ImageEditor.java

  Log Message:
  -----------
  removed unused bitmaps


  Commit: c8aa1575dda5e0d4769104e3a53573bc8980164a
      https://github.com/guardianproject/SecureSmartCam/commit/c8aa1575dda5e0d4769104e3a53573bc8980164a
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M src/org/witness/ssc/video/RegionTrail.java

  Log Message:
  -----------
  added tweening mode tracking


  Commit: 4cd0e26114023e87db2030c616b6ce3fa49aa29a
      https://github.com/guardianproject/SecureSmartCam/commit/4cd0e26114023e87db2030c616b6ce3fa49aa29a
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M src/org/witness/ssc/video/ObscureRegion.java

  Log Message:
  -----------
  cached RectF creation for better perf/mem


  Commit: e50a3caa6f01a2be203b73039481001169ab5d25
      https://github.com/guardianproject/SecureSmartCam/commit/e50a3caa6f01a2be203b73039481001169ab5d25
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  added tweening, improved face detect & region tracking


  Commit: b5769da95928cf41b1ac165487164fad0584e23e
      https://github.com/guardianproject/SecureSmartCam/commit/b5769da95928cf41b1ac165487164fad0584e23e
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M res/xml/videopreferences.xml

  Log Message:
  -----------
  removed default pref values


  Commit: e58412e1dd1bc52c6b64d69a58ce8798efcba505
      https://github.com/guardianproject/SecureSmartCam/commit/e58412e1dd1bc52c6b64d69a58ce8798efcba505
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M src/org/witness/ssc/video/FFMPEGWrapper.java
    M src/org/witness/ssc/video/ObscureRegion.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  improved tweaning and redact file writing


  Commit: 580798e06959113878c1d7b3c26aa36d522483e0
      https://github.com/guardianproject/SecureSmartCam/commit/580798e06959113878c1d7b3c26aa36d522483e0
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M src/org/witness/ssc/video/RegionTrail.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  fixes issues with intersecting region detect + time


  Commit: 45c131a2b1b241365688773186edaec50cef3c52
      https://github.com/guardianproject/SecureSmartCam/commit/45c131a2b1b241365688773186edaec50cef3c52
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  version update


  Commit: 638826f72098165d96f13886b83bb47c764ff4df
      https://github.com/guardianproject/SecureSmartCam/commit/638826f72098165d96f13886b83bb47c764ff4df
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-06-15 (Fri, 15 Jun 2012)

  Changed paths:
    M AndroidManifest.xml
    M res/raw/ffmpeg.mp3
    M res/xml/videopreferences.xml
    M src/org/witness/ssc/video/FFMPEGWrapper.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  update ffmpeg, new version


  Commit: b9e5bc863c4065459fe9e666efc0aaaa0236f3c9
      https://github.com/guardianproject/SecureSmartCam/commit/b9e5bc863c4065459fe9e666efc0aaaa0236f3c9
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M AndroidManifest.xml
    M res/layout/main.xml
    M res/raw/ffmpeg.mp3
    M src/org/witness/ssc/video/RegionTrail.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  fixed ffmpeg memory leak and file paths


  Commit: 3e3b316e9f7ab88430ec5ae341529b6516c1e787
      https://github.com/guardianproject/SecureSmartCam/commit/3e3b316e9f7ab88430ec5ae341529b6516c1e787
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated version


  Commit: e6eef28c3b9f3126d15a70c2c0553e916812096f
      https://github.com/guardianproject/SecureSmartCam/commit/e6eef28c3b9f3126d15a70c2c0553e916812096f
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M AndroidManifest.xml
    M res/menu-v11/video_editor_menu.xml
    M res/menu/video_editor_menu.xml
    M res/values/strings.xml
    M src/org/witness/ssc/video/FFMPEGWrapper.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  added ffmpeg upgrade code, fixed move region on stop


  Commit: 4a7004544eec465127e58ff7c48c7896274d426f
      https://github.com/guardianproject/SecureSmartCam/commit/4a7004544eec465127e58ff7c48c7896274d426f
  Author: n8fr8 <nathan at freitas.net>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M res/xml/videopreferences.xml
    M src/org/witness/securesmartcam/ImageEditor.java
    A src/org/witness/securesmartcam/detect/DetectedFace.java
    M src/org/witness/securesmartcam/detect/FaceDetection.java
    M src/org/witness/securesmartcam/detect/GoogleFaceDetection.java
    M src/org/witness/ssc/video/VideoEditor.java

  Log Message:
  -----------
  updates to FaceDetect and VideoPlayer stability


Compare: https://github.com/guardianproject/SecureSmartCam/compare/7b55a4fc257f...4a7004544eec


More information about the Ssc-dev mailing list