Prepare release 2.0

wallabag · May 2, 2017 · 7b5cac5 · 7b5cac5
1 parent fb7ee34
commit 7b5cac5
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/bagit/Info.plist b/bagit/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>1.3.3</string>
 	<key>CFBundleVersion</key>
-	<string>40</string>
+	<string>41</string>
 	<key>ITSEncryptionExportComplianceCode</key>
 	<string></string>
 	<key>NSAppTransportSecurity</key>

diff --git a/wallabag.xcodeproj/project.pbxproj b/wallabag.xcodeproj/project.pbxproj
@@ -1154,7 +1154,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = wallabag/wallabag.entitlements;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 41;
 				DEVELOPMENT_TEAM = G97URPCGB8;
 				INFOPLIST_FILE = wallabag/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1172,7 +1172,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = wallabag/wallabag.entitlements;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 41;
 				DEVELOPMENT_TEAM = G97URPCGB8;
 				INFOPLIST_FILE = wallabag/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

diff --git a/wallabag/Info.plist b/wallabag/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>1.3.3</string>
 	<key>CFBundleVersion</key>
-	<string>40</string>
+	<string>41</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/wallabag/Lib/BearerTokenAdapter.swift b/wallabag/Lib/BearerTokenAdapter.swift
@@ -59,6 +59,9 @@ class BearerTokenAdapter: RequestAdapter, RequestRetrier {
                     strongSelf.lock.lock() ; defer { strongSelf.lock.unlock() }
 
                     if let accessToken = accessToken, let refreshToken = refreshToken {
+                        let shareDefaults = UserDefaults(suiteName: "group.wallabag.share_extension")
+                        shareDefaults?.set(accessToken, forKey: "token")
+                        shareDefaults?.set(refreshToken, forKey: "refreshToken")
                         strongSelf.accessToken = accessToken
                         strongSelf.refreshToken = refreshToken
                     }

diff --git a/wallabag/Lib/WallabagApi.swift b/wallabag/Lib/WallabagApi.swift
@@ -72,6 +72,9 @@ final class WallabagApi {
                     return
             }
 
+            let shareDefaults = UserDefaults(suiteName: "group.wallabag.share_extension")
+            shareDefaults?.set(accessToken, forKey: "token")
+            shareDefaults?.set(refreshToken, forKey: "refreshToken")
             let bearer = BearerTokenAdapter(clientID: clientId!, clientSecret: clientSecret!, username: username!, password: password!, baseURLString: endpoint!, accessToken: accessToken, refreshToken: refreshToken)
             sessionManager.adapter = bearer
             sessionManager.retrier = bearer

diff --git a/wallabagScreenshotUITests/Info.plist b/wallabagScreenshotUITests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>40</string>
+	<string>41</string>
 </dict>
 </plist>
diff --git a/wallabagTests/Info.plist b/wallabagTests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>40</string>
+	<string>41</string>
 </dict>
 </plist>
diff --git a/wallabagUITests/Info.plist b/wallabagUITests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>40</string>
+	<string>41</string>
 </dict>
 </plist>