[guardian-dev] [guardianproject/Gibberbot] 10cdf6: better handling of cancel/back button from signin ...

Nathan Freitas nathan at freitas.net
Thu Sep 15 18:19:15 EDT 2011 

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

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

  Changed paths:
    M src/info/guardianproject/otr/app/im/app/AccountActivity.java
  M src/info/guardianproject/otr/app/im/app/SigningInActivity.java
  M src/info/guardianproject/otr/app/im/app/WelcomeActivity.java
  M src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java

  Log Message:
  -----------
  better handling of cancel/back button from signin screen


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

  Changed paths:
    M res/layout/signing_in_activity.xml

  Log Message:
  -----------
  modified sign in screen


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

  Changed paths:
    A libs/asmack-jse-buddycloud.jar
  R libs/asmack-jse.jar

  Log Message:
  -----------
  new asmack lib


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

  Changed paths:
    M .classpath

  Log Message:
  -----------
  updated asmack jar path


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

  Changed paths:
    M AndroidManifest.xml
  M res/drawable/bkgd_gibberbot.png
  R res/drawable/gibberbg.jpg
  M res/drawable/splash.png
  M res/layout/account_activity.xml
  A res/layout/alert_dialog_text_entry.xml
  M res/layout/contact_list_filter_view.xml
  M res/layout/contact_list_view.xml
  M res/layout/fields_buttons_view.xml
  M res/menu/account_settings_menu.xml
  M res/menu/chat_screen_menu.xml
  M res/menu/contact_list_menu.xml
  M res/values/strings.xml
  R src/info/guardianproject/otr/AndroidSecureRandom.java
  M src/info/guardianproject/otr/OtrKeyManagerAdapter.java
  M src/info/guardianproject/otr/app/im/IRemoteImService.aidl
  M src/info/guardianproject/otr/app/im/app/AccountActivity.java
  M src/info/guardianproject/otr/app/im/app/ChatListAdapter.java
  M src/info/guardianproject/otr/app/im/app/ContactListActivity.java
  M src/info/guardianproject/otr/app/im/app/ContactListFilterView.java
  M src/info/guardianproject/otr/app/im/app/ContactListView.java
  M src/info/guardianproject/otr/app/im/app/ImApp.java
  M src/info/guardianproject/otr/app/im/app/ImPluginHelper.java
  M src/info/guardianproject/otr/app/im/app/LandingPage.java
  M src/info/guardianproject/otr/app/im/app/NewChatActivity.java
  M src/info/guardianproject/otr/app/im/app/SigningInActivity.java
  M src/info/guardianproject/otr/app/im/app/WelcomeActivity.java
  M src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java
  M src/info/guardianproject/otr/app/im/provider/ImpsProvider.java
  M src/info/guardianproject/otr/app/im/service/ChatSessionAdapter.java
  M src/info/guardianproject/otr/app/im/service/ChatSessionManagerAdapter.java
  M src/info/guardianproject/otr/app/im/service/RemoteImService.java

  Log Message:
  -----------
  Merge branch 'passcode-dev'

Conflicts:
	src/info/guardianproject/otr/app/im/app/AccountActivity.java
	src/info/guardianproject/otr/app/im/app/SigningInActivity.java
	src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java


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

  Changed paths:
    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

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


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

  Changed paths:
    M .classpath
  M src/info/guardianproject/otr/app/im/app/WelcomeActivity.java
  M src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java
  M src/info/guardianproject/otr/app/im/provider/ImpsProvider.java
  M src/info/guardianproject/otr/app/im/service/RemoteImService.java

  Log Message:
  -----------
  disabling sqlcipher support for now


  Commit: feda5b9ee3f8807c7d51c21ac891a898989f2722
      https://github.com/guardianproject/Gibberbot/commit/feda5b9ee3f8807c7d51c21ac891a898989f2722
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

  Changed paths:
    A src/info/guardianproject/otr/app/im/plugin/xmpp/ServerTrustManager.java
  M src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java

  Log Message:
  -----------
  fixed SSL/CACert verification; implemented custom TrustManager


  Commit: 48d5b5150257c4d492f1c9629c9c247478cff88c
      https://github.com/guardianproject/Gibberbot/commit/48d5b5150257c4d492f1c9629c9c247478cff88c
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

  Changed paths:
    M res/layout/account_activity.xml
  M src/info/guardianproject/otr/app/im/app/AccountActivity.java

  Log Message:
  -----------
  fixed OTR fingerprint display, and account update parsing


  Commit: 5dba1efdc7d184f9f73abd94f3f2e2f68c7b8352
      https://github.com/guardianproject/Gibberbot/commit/5dba1efdc7d184f9f73abd94f3f2e2f68c7b8352
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

  Changed paths:
    M src/info/guardianproject/otr/app/im/app/ContactListActivity.java
  M src/info/guardianproject/otr/app/im/app/ContactListFilterView.java

  Log Message:
  -----------
  updated search/filter functionality


  Commit: cf8998be0414355db6b6e0b47951652f9039cc73
      https://github.com/guardianproject/Gibberbot/commit/cf8998be0414355db6b6e0b47951652f9039cc73
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

  Changed paths:
    A res/xml/searchable.xml

  Log Message:
  -----------
  added support for searchable feature


  Commit: 276c4c8cfb746966bcfa64918ac00ae285390371
      https://github.com/guardianproject/Gibberbot/commit/276c4c8cfb746966bcfa64918ac00ae285390371
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

  Changed paths:
    M res/values/strings.xml

  Log Message:
  -----------
  added new strings for search UI


  Commit: ebe280f72500e5e9849b0099e7ff4508c87d0b4d
      https://github.com/guardianproject/Gibberbot/commit/ebe280f72500e5e9849b0099e7ff4508c87d0b4d
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

  Changed paths:
    M src/info/guardianproject/otr/app/im/app/WelcomeActivity.java

  Log Message:
  -----------
  removed SQLCipher/passcode support for now


  Commit: be725ba1971fb91b74adb8bdaef1e051b010fff7
      https://github.com/guardianproject/Gibberbot/commit/be725ba1971fb91b74adb8bdaef1e051b010fff7
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

  Changed paths:
    M src/info/guardianproject/otr/app/im/provider/ImpsProvider.java

  Log Message:
  -----------
  removed SQLCipher support for now


  Commit: 3b61852563e31cf73df8c4ba7b9f7bbf51667064
      https://github.com/guardianproject/Gibberbot/commit/3b61852563e31cf73df8c4ba7b9f7bbf51667064
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated version, added searchable support


  Commit: be1b549ef4faf37bd0b0dd24d23a915b2557c4cd
      https://github.com/guardianproject/Gibberbot/commit/be1b549ef4faf37bd0b0dd24d23a915b2557c4cd
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

  Changed paths:
    M src/info/guardianproject/otr/app/im/provider/ImpsProvider.java

  Log Message:
  -----------
  cleaned up debug statements


  Commit: 9519014b221c379966d4d9bf193889d736d29927
      https://github.com/guardianproject/Gibberbot/commit/9519014b221c379966d4d9bf193889d736d29927
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

  Changed paths:
    A res/raw/cacerts.bks
  M src/info/guardianproject/otr/app/im/plugin/xmpp/ServerTrustManager.java
  M src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java

  Log Message:
  -----------
  added support for embedded cacerts file


Compare: https://github.com/guardianproject/Gibberbot/compare/5360c0c...9519014

More information about the Guardian-dev mailing list