Merge branch '2.2-dev'

.travis.yml

@@ -13,6 +13,6 @@ env:
 before_install:
   - gem install -N cocoapods -v 1.2.0
   - pod repo update > /dev/null
+  - gem update fastlane --no-ri --no-rdoc --no-document
 script:
-  - set -o pipefail
-  - xcodebuild test -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" ONLY_ACTIVE_ARCH=YES | xcpretty
+  - fastlane test

Podfile.lock

@@ -1,13 +1,13 @@
 PODS:
-  - Alamofire (4.4.0)
+  - Alamofire (4.5.0)
   - AlamofireImage (3.2.0):
     - Alamofire (~> 4.1)
-  - AlamofireNetworkActivityIndicator (2.1.0):
-    - Alamofire (~> 4.1)
-  - SideMenu (2.3.2)
-  - SwiftyBeaver (1.2.2)
+  - AlamofireNetworkActivityIndicator (2.2.0):
+    - Alamofire (~> 4.5)
+  - SideMenu (2.3.3)
+  - SwiftyBeaver (1.4.0)
   - TUSafariActivity (1.0.4)
-  - WallabagKit (0.1.2):
+  - WallabagKit (0.1.3):
     - Alamofire
 
 DEPENDENCIES:
@@ -20,14 +20,14 @@ DEPENDENCIES:
   - WallabagKit
 
 SPEC CHECKSUMS:
-  Alamofire: dc44b1600b800eb63da6a19039a0083d62a6a62d
+  Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
   AlamofireImage: 157ed682cc81d3b9db4fb90c1f12180ac552d93b
-  AlamofireNetworkActivityIndicator: 4716f6554bdfb9c7cf13b1e0e3af21163129690a
-  SideMenu: 3fa07dd05d4bade2b6f9889fb1877e312e1ba319
-  SwiftyBeaver: 90a39e3dc5136b7285f2e4c870b107e3933b8b84
+  AlamofireNetworkActivityIndicator: 81e1630e7cfed22a4e4e82a174c59e651dc4f8ca
+  SideMenu: a447554ae5c982e8077666389e1c8b0c8656e065
+  SwiftyBeaver: 78d9186ce7595b4400ce01e5fd750d263e72dd7b
   TUSafariActivity: afc55a00965377939107ce4fdc7f951f62454546
-  WallabagKit: f6c285143adf9d4c80f3705d425c20c217e3272f
+  WallabagKit: 636064b251850d1784ff0b022f0703a5b3ff2233
 
 PODFILE CHECKSUM: 6f769465ea8f6602d14e817c11be40a4f57d788b
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.3.1

bagit/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.2</string>
+	<string>2.2</string>
 	<key>CFBundleVersion</key>
-	<string>61</string>
+	<string>68</string>
 	<key>ITSEncryptionExportComplianceCode</key>
 	<string></string>
 	<key>NSAppTransportSecurity</key>

bagit/ShareViewController.swift

@@ -43,10 +43,18 @@ class ShareViewController: UIViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         if WallabagApi.isConfigured() {
-            for item in (self.extensionContext?.inputItems as? [NSExtensionItem])! {
-                for attachements in (item.attachments as? [NSItemProvider])! {
-                    if attachements.hasItemConformingToTypeIdentifier("public.url") {
-                        attachements.loadItem(forTypeIdentifier: "public.url", options: nil, completionHandler: { (url, _) -> Void in
+            guard let items = extensionContext?.inputItems as? [NSExtensionItem] else {
+                self.extensionContext?.cancelRequest(withError: NSError())
+                return
+            }
+            for item in items {
+                guard let attachements = item.attachments as? [NSItemProvider] else {
+                    self.extensionContext?.cancelRequest(withError: NSError())
+                    return
+                }
+                for attachement in attachements {
+                    if attachement.hasItemConformingToTypeIdentifier("public.url") {
+                        attachement.loadItem(forTypeIdentifier: "public.url", options: nil, completionHandler: { (url, _) -> Void in
                             if let shareURL = url as? NSURL {
                                 WallabagApi.addArticle(shareURL as URL, completion: { _ in
                                     UIView.animate(withDuration: 1.0, animations: {
@@ -63,7 +71,7 @@ class ShareViewController: UIViewController {
                 }
             }
         } else {
-            // @todo handle no configured server or 4** response 
+            self.extensionContext?.cancelRequest(withError: NSError())
         }
     }
 }

fastlane/Fastfile

@@ -11,7 +11,15 @@ platform :ios do
 
   desc "Runs all the tests"
   lane :test do
-    scan
+    scan(scheme: "wallabag")
+  end
+
+  lane :testlib do 
+    scan(scheme: "WallabagTest")
+  end
+
+  lane :testui do 
+    scan(scheme: "WallabagTestUi")
   end
 
   desc "Submit a new Beta Build to Apple TestFlight"

fastlane/README.md

@@ -35,6 +35,16 @@ xcode-select --install
 fastlane ios test
 ```
 Runs all the tests
+### ios testlib
+```
+fastlane ios testlib
+```
+
+### ios testui
+```
+fastlane ios testui
+```
+
 ### ios beta
 ```
 fastlane ios beta

fastlane/metadata/de-DE/release_notes.txt

@@ -1,11 +1,18 @@
 Hello wallabag user!
 
-In this release we fix some bugs:
-- Arrange Ipad UI
-- Badge always show
-- App freeze on article
-- Arrange text on swipe article
-- Top bar disappearing on the homepage 
-- Page Tip and About UI
-
-If you like our app, do not hesitate to add comments on the app store
+I worked hard on this release to provide a real read it later app.
+All articles are now synced to your device.
+
+You can now try the speech synthesis on article view, it's not perfect but it's here, enjoy!
+
+I add home screen action.
+
+I've reworked on the theme, the app is now trying to follow your selected theme everywhere.
+
+Now when your are on article view your device won't be lock
+
+Special thank to 0wnrepo, he added Romanian Localization! thanks dude!
+
+If you like our app, do not hesitate to add comments on the app store, write review, and tip in app!
+
+Enjoy your read!

fastlane/metadata/en-US/release_notes.txt

@@ -1,11 +1,18 @@
 Hello wallabag user!
 
-In this release we fix some bugs:
-- Arrange Ipad UI
-- Badge always show
-- App freeze on article
-- Arrange text on swipe article
-- Top bar disappearing on the homepage 
-- Page Tip and About UI
-
-If you like our app, do not hesitate to add comments on the app store
+I worked hard on this release to provide a real read it later app.
+All articles are now synced to your device.
+
+You can now try the speech synthesis on article view, it's not perfect but it's here, enjoy!
+
+I add home screen action.
+
+I've reworked on the theme, the app is now trying to follow your selected theme everywhere.
+
+Now when your are on article view your device won't be lock
+
+Special thank to 0wnrepo, he added Romanian Localization! thanks dude!
+
+If you like our app, do not hesitate to add comments on the app store, write review, and tip in app!
+
+Enjoy your read!

fastlane/metadata/fr-FR/release_notes.txt

@@ -1,11 +1,18 @@
-Hello wallabag user!
+Hello les utilisateurs de wallabag!
 
-In this release we fix some bugs:
-- Arrange Ipad UI
-- Badge always show
-- App freeze on article
-- Arrange text on swipe article
-- Top bar disappearing on the homepage 
-- Page Tip and About UI
+J'ai travaillé dur sur cette version pour fournir une véritable application de lecture.
+Tous les articles sont maintenant synchronisés sur votre appareil.
 
-If you like our app, do not hesitate to add comments on the app store
+Vous pouvez maintenant essayer la synthèse vocale sur la vue des articles, ce n'est pas parfait mais c'est ici, profitez-en!
+
+Des homescreen action sont disponibles maintenant.
+
+J'ai retravaillé sur le thème, l'application essaie maintenant de suivre partout votre thème sélectionné.
+
+Maintenant, lorsque vous êtes sur l'article, votre appareil ne sera plus verrouillé.
+
+Un grand merci à 0wnrepo, il a ajouté la traduction roumaine! merci mec!
+
+Si vous aimez notre application, n'hésitez pas à ajouter des commentaires, écrire des critiques et donner un pourboire à l'application!
+
+Profitez de votre lecture!