Merge remote-tracking branch 'drebs/bug/2853-use-latest-soledad-api-2' into develop

4 files changed, 7 insertions, 75 deletions

diff --git a/NEWS.rst b/NEWS.rst
deleted file mode 100644
index 00350cbb..00000000
--- a/NEWS.rst
+++ /dev/null
@@ -1,69 +0,0 @@
-==================================
-User-facing changes in Leap Client
-==================================
-
-Release 0.2.0 (2012-10-XX)
---------------------------
-
-This release is a functionally working version in Debian Squeeze and Ubuntu 12.04.
-It is able to connect to a preconfigured leap provider and autoconfigures a EIP connection.
-
-Python Support
-''''''''''''''
-This release supports Python2.6 and Python2.7
-
-New Features
-''''''''''''
-- Branded build: the final package includes branding info needed to connect to a default provider. 
-- First run wizard: allows to register an user with the selected provider. It also downloads all
-  the config files needed to connect to the eip service on this provider.
-- Network checks: we do some basic network testing and warn user in case we cannot find a
-  suitable network interface, or if the virtual interface dissapears after a successful eip connection.
-- Debug mode and logfiles: the leap-client script allows to be invoked with the --debug flag.
-  It also accepts a --logfile option that is useful for documenting bug reports.
-
-Dependencies
-''''''''''''
-See the ``README.rst`` for a step-to-step install guide.
-
-The following libraries are needed:
-
-- PyQt4
-- libgnutls
-- openvpn
-
-for building the package dependencies, you will need also:
-
-- python-setuptools
-- python-dev
-- libgnutls-dev
-
-Leap-Client depends on the following python packages:
-
-- requests
-- ping
-- psutil
-- netifaces
-- jsonschema
-- srp
-- pycrypto
-- keyring
-- python-gnutls==1.1.9
-
-We are freezing the python-gnutls library dependency for this release due to a bug in ubuntu, see:
-https://bugs.launchpad.net/ubuntu/+source/python-gnutls/+bug/1027129
-
-
-Configuration files
-'''''''''''''''''''
-
-Config files are created under ``~/.config/leap``
-Currently user should be able to completely remove this folder and have it auto-generated in the first run.
-
-- Current eip service config is stored in ``eip.json``
-- Under ``.config/leap/providers``, there is a per-provider folder that contains:
-  - ``provider.json``, with all options for connecting to this provider.
-  - ``eip-service.json``, with eip-specific configuration options,
-  - ``keys/ca``, for a copy of the ca certificates used in the tls connections to provider.
-  - ``keys/client``, for a local copy of leap user certificates used in the eip connection.
-- ``leap.conf`` for general application configurations (gui windows geometry, ...).
diff --git a/changes/bug-2853-use-latest-soledad-api b/changes/bug-2853-use-latest-soledad-api
new file mode 100644
index 00000000..b27e38aa
--- /dev/null
+++ b/changes/bug-2853-use-latest-soledad-api
@@ -0,0 +1 @@
+  o Adapt code to Soledad 0.2.1 api.
diff --git a/src/leap/keymanager/openpgp.py b/src/leap/keymanager/openpgp.py
index 89323117..d19bb2b5 100644
--- a/src/leap/keymanager/openpgp.py
+++ b/src/leap/keymanager/openpgp.py
@@ -604,7 +604,7 @@ class OpenPGPScheme(EncryptionScheme):
         :param private: Whether to look for a private key.
         :type private: bool
         :return: The document with the key or None if it does not exist.
-        :rtype: leap.soledad.backends.leap_backend.LeapDocument
+        :rtype: leap.soledad.document.SoledadDocument
         """
         doclist = self._soledad.get_from_index(
             TAGS_ADDRESS_PRIVATE_INDEX,
diff --git a/src/leap/services/soledad/soledadbootstrapper.py b/src/leap/services/soledad/soledadbootstrapper.py
index 2635a7e6..46e985ad 100644
--- a/src/leap/services/soledad/soledadbootstrapper.py
+++ b/src/leap/services/soledad/soledadbootstrapper.py
@@ -95,11 +95,11 @@ class SoledadBootstrapper(AbstractBootstrapper):
 
         self._soledad = Soledad(uuid,
                                 self._password.encode("utf-8"),
-                                secrets_path,
-                                local_db_path,
-                                server_url,
-                                cert_file,
-                                srp_auth.get_token())
+                                secrets_path=secrets_path,
+                                local_db_path=local_db_path,
+                                server_url=server_url,
+                                cert_file=cert_file,
+                                auth_token=srp_auth.get_token())
         self._soledad.sync()
 
     def _download_config(self):