Merge pull request #1349 from glouvigny/fix-updates

fix: android self-updates + update channels

client/Makefile

@@ -40,6 +40,9 @@ help:
 
 .PHONY: deps.lerna
 deps.lerna: $(LERNA_MODS)
+	@if [ -z "$$(grep 'intent.addFlags.Intent.FLAG_ACTIVITY_NEW_TASK' $(PWD)/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java)" ]; then \
+		patch $(PWD)/node_modules/rn-fetch-blob/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java $(PWD)/patch/rn-fetch-blob.patch ; \
+	fi
 
 $(LERNA_MODS): $(LERNA_PACKAGES) $(LERNA)
 	$(LERNA) --reject-cycles bootstrap --hoist $(shell [ ! -z "$$CIRCLE_JOB" ] && echo "--ci --concurrency=2")

client/packages/update/update.js

@@ -19,38 +19,41 @@ const updateApiSources = {
     url: 'https://yolo.berty.io/release/ios-staff.json',
     channel: 'dev',
   },
-  'chat.berty.ios.debug': {
-    url: 'https://yolo.berty.io/release/ios-staff.json',
-    channel: 'dev',
-  },
-  'chat.berty.ios': {
-    url: 'https://yolo.berty.io/release/ios.json',
-    channel: 'dev',
-  },
   'chat.berty.ios.yolo': {
     url: 'https://yolo.berty.io/release/ios.json',
     channel: 'beta',
   },
-  'chat.berty.main.debug': {
-    url: 'https://yolo.berty.io/release/android.json',
-    channel: 'dev',
-  },
   'chat.berty.main.staff': {
-    url: 'https://yolo.berty.io/release/android.json',
+    url: 'https://yolo.berty.io/release/android-staff.json',
     channel: 'beta',
   },
   'chat.berty.main.yolo': {
     url: 'https://yolo.berty.io/release/android.json',
     channel: 'beta',
   },
-  'chat.berty.main': {
-    url: 'https://yolo.berty.io/release/android.json',
-    channel: 'beta',
-  },
   'chat.berty.macos': {
     url: 'https://yolo.berty.io/release/desktop/mac.json',
     channel: 'staff',
   },
+  //
+  // // Disabled update channels
+  //
+  // 'chat.berty.ios.debug': {
+  //   url: 'https://yolo.berty.io/release/ios-staff.json',
+  //   channel: 'dev',
+  // },
+  // 'chat.berty.ios': {
+  //   url: 'https://yolo.berty.io/release/ios.json',
+  //   channel: 'dev',
+  // },
+  // 'chat.berty.main.debug': {
+  //   url: 'https://yolo.berty.io/release/android.json',
+  //   channel: 'dev',
+  // },
+  // 'chat.berty.main': {
+  //   url: 'https://yolo.berty.io/release/android.json',
+  //   channel: 'beta',
+  // },
 }
 
 export const getAvailableUpdate = async context => {

client/patch/rn-fetch-blob.patch

@@ -0,0 +1,23 @@
+From 0b47f3d34a95504eab6ead1784c1646fc7c2e9b3 Mon Sep 17 00:00:00 2001
+From: Michael Gall <michael@wakeless.net>
+Date: Thu, 7 Mar 2019 17:44:46 +1100
+Subject: [PATCH] Add the FLAG_ACTIVITY_NEW_TASK flag.
+
+This is caused by an error on Android 9: 'Error: Calling startActivity() from outside of an Activity  context requires the FLAG_ACTIVITY_NEW_TASK flag. Is this really what you want?'
+---
+ android/src/main/java/com/RNFetchBlob/RNFetchBlob.java | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java b/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
+index ac9ce566..be310c87 100644
+--- a/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
++++ b/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java
+@@ -120,6 +120,8 @@ public void actionViewIntent(String path, String mime, final Promise promise) {
+                 // Set flag to give temporary permission to external app to use FileProvider
+                 intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
++                // All the activity to be opened outside of an activity
++                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                 // Validate that the device can open the file
+                 PackageManager pm = getCurrentActivity().getPackageManager();
+                 if (intent.resolveActivity(pm) != null) {