3 files changed, 13 insertions, 38 deletions

diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml
index ab516ca5..f421821c 100644
--- a/src/Wallabag/ImportBundle/Resources/config/services.yml
+++ b/src/Wallabag/ImportBundle/Resources/config/services.yml
@@ -1,14 +1,4 @@
 services:
-    wallabag_import.pocket.import:
-        class: Wallabag\ImportBundle\Import\PocketImport
-        arguments:
-            - "@security.token_storage"
-            - "@session"
-            - "@doctrine.orm.entity_manager"
-            - %pocket_consumer_key%
-        calls:
-            - [ setClient, [ "@wallabag_import.pocket.client" ] ]
-
     wallabag_import.pocket.client:
         class: GuzzleHttp\Client
         arguments:
@@ -17,3 +7,14 @@ services:
                     headers:
                         content-type: "application/json"
                         X-Accept: "application/json"
+
+    wallabag_import.pocket.import:
+        class: Wallabag\ImportBundle\Import\PocketImport
+        arguments:
+            - "@security.token_storage"
+            - "@doctrine.orm.entity_manager"
+            - "@wallabag_core.content_proxy"
+            - %pocket_consumer_key%
+        calls:
+            - [ setClient, [ "@wallabag_import.pocket.client" ] ]
+            - [ setLogger, [ "@logger" ]]
diff --git a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
index ee759a52..b068283a 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
@@ -8,35 +8,9 @@
         <div class="card-panel settings">
             {% trans %}Welcome on wallabag importer. Please select your previous service that you want to migrate.{% endtrans %}
             <ul>
-                <li><a href="{{ path('pocket_import') }}">Pocket</a></li>
+                <li><a href="{{ path('import_pocket') }}">Pocket</a></li>
             </ul>
         </div>
     </div>
 </div>
-
-
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-            <div class="row">
-                <div class="col s12">
-                    <form action="{{ path('import') }}" method="post" {{ form_enctype(form.import) }}>
-                        {{ form_errors(form.import) }}
-                        <div class="row">
-                            <div class="input-field col s12">
-                                <p>{% trans %}Please select your wallabag export and click on the below button to upload and import it.{% endtrans %}</p>
-                                {{ form_errors(form.import.file) }}
-                                {{ form_widget(form.import.file) }}
-                            </div>
-                        </div>
-                        <div class="hidden">{{ form_rest(form.import) }}</div>
-                        <button class="btn waves-effect waves-light" type="submit" name="action">
-                            {% trans %}Upload file{% endtrans %}
-                        </button>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
 {% endblock %}
diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index df64e472..940fe4cc 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -7,7 +7,7 @@
     <div class="col s12">
         <div class="card-panel settings">
             {% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}
-            <form method="post" action="{{ path('pocket_auth') }}">
+            <form method="post" action="{{ path('import_pocket_auth') }}">
                 <input type="submit" value="Connect to Pocket and import data" />
             </form>
         </div>