fix: android self-updates + update channels

berty · Sep 3, 2019 · 1021ced · 1021ced
1 parent 3c4bccb
commit 1021ced
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 18 deletions.
diff --git a/client/Makefile b/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")

diff --git a/client/packages/update/update.js b/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 => {

diff --git a/client/patch/rn-fetch-blob.patch b/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) {
diff --git a/core/go.mod b/core/go.mod
@@ -8,11 +8,11 @@ require (
 	cloud.google.com/go v0.34.0 // indirect
 	github.com/0xAX/notificator v0.0.0-20181105090803-d81462e38c21
 	github.com/akavel/rsrc v0.0.0-20170831122431-f6a15ece2cfd // indirect
+	github.com/asticode/go-astiamqp v1.0.0 // indirect
 	github.com/asticode/go-astilectron v0.8.1-0.20190415090856-5d5f14367434
 	github.com/asticode/go-astilectron-bootstrap v0.0.0-20180616141213-b3211646d205
 	github.com/asticode/go-astilectron-bundler v0.0.0-20190426172205-155c2a10bbb1 // indirect
 	github.com/asticode/go-astilog v1.0.0
-	github.com/asticode/go-astitools v1.0.0 // indirect
 	github.com/asticode/go-bindata v0.0.0-20151023091102-a0ff2567cfb7 // indirect
 	github.com/brianvoe/gofakeit v3.17.0+incompatible
 	github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect