From 52bbdec4681d86d6fb06fd281b14a1d41b6330ba Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Tue, 23 Apr 2019 17:25:32 +0200
Subject: [PATCH] riot-android: add security 0.8.28a release

Build from my fork which backports the necessary fixes. The latest
riot-android release cannot be built because it contains proprietary
libs from jitsi.
---
 metadata/im.vector.alpha.yml | 73 ++++++++++++++++++++++++++++++++++--
 srclibs/matrixsdk.txt        |  2 +-
 2 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/metadata/im.vector.alpha.yml b/metadata/im.vector.alpha.yml
index 858293f3ac..2b66db4a95 100644
--- a/metadata/im.vector.alpha.yml
+++ b/metadata/im.vector.alpha.yml
@@ -68,7 +68,7 @@ Description: |-
     * NonFreeNet - Currently the integration server is not configurable in this client and linked to the non-free New Vector implementation. Free alternatives exists but supporting them in Riot Android is still being worked on.
 
 RepoType: git
-Repo: https://github.com/vector-im/riot-android
+Repo: https://github.com/Bubu/mini-vector-android.git
 
 Builds:
   - versionName: 0.3.2
@@ -1770,6 +1770,73 @@ Builds:
       - cp $$matrixsdk$$/matrix-sdk/build/outputs/aar/matrix-sdk-release-*.aar libs/matrix-sdk.aar
     ndk: r17b
 
+  - versionName: 0.8.28a
+    versionCode: 82801
+    commit: v0.8.28a
+    subdir: vector
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y --no-install-recommends g++ -t stretch-backports npm
+      - npm install -g react-native-cli
+    gradle:
+      - appfdroid
+    srclibs:
+      - matrixsdk@v0.9.19a
+      - olmsdk@3.0.0
+      - jitsi-meet@c109199e060faa05440c6971f0683e8eb4d81167
+    prebuild:
+      - sed -i -e '/com.google.firebase/d' build.gradle
+      - sed -i -e '/com.google.gms.google-services/d' build.gradle
+      - find . -name *.aar -exec truncate -s 0 {} \;
+    build:
+      - pushd $$olmsdk$$/android
+      - echo ndk.dir=$$NDK$$ > local.properties
+      - rm gradle.properties
+      - gradle assembleRelease
+      - popd
+      - cp $$olmsdk$$/android/olm-sdk/build/outputs/aar/olm-sdk-release-*.aar libs/olm-sdk.aar
+      - cp $$olmsdk$$/android/olm-sdk/build/outputs/aar/olm-sdk-release-*.aar $$matrixsdk$$/matrix-sdk/libs/olm-sdk.aar
+      - pushd $$jitsi-meet$$
+      - "sed -i -e 's|\"url-polyfill\": \"github:github/url-polyfill#39734186de44612bc5a16eb25f5407adcc5b2e7c\"\
+        |\"@webcomponents/url\": \"0.7.1\"|' package.json"
+      - sed -i -e 's|url-polyfill|@webcomponents/url|' react/features/base/lib-jitsi-meet/native/polyfills-browser.js
+      - sed -i -e '/url-polyfill/d' react/features/base/lib-jitsi-meet/_.web.js
+      - rm package-lock.json
+      - npm install
+      - make
+      - pushd android
+      - gradle assembleRelease
+      - popd
+      - react-native bundle --platform android --dev false --entry-file index.android.js
+        --bundle-output index.android.bundle --assets-dest android/app/src/main/res/
+      - popd
+      - cp $$jitsi-meet$$/android/sdk/build/outputs/aar/sdk-release.aar libs/jitsi-sdk.aar
+      - cp $$jitsi-meet$$/node_modules/react-native-background-timer/android/build/outputs/aar/react-native-background-timer-release.aar
+        libs/react-native-background-timer.aar
+      - cp $$jitsi-meet$$/node_modules/react-native-fetch-blob/android/build/outputs/aar/react-native-fetch-blob-release.aar
+        libs/react-native-fetch-blob.aar
+      - cp $$jitsi-meet$$/node_modules/react-native-immersive/android/build/outputs/aar/react-native-immersive-release.aar
+        libs/react-native-immersive.aar
+      - cp $$jitsi-meet$$/node_modules/react-native-keep-awake/android/build/outputs/aar/react-native-keep-awake-release.aar
+        libs/react-native-keep-awake.aar
+      - cp $$jitsi-meet$$/node_modules/react-native-vector-icons/android/build/outputs/aar/react-native-vector-icons-release.aar
+        libs/react-native-vector-icons.aar
+      - cp $$jitsi-meet$$/node_modules/react-native-webrtc/android/build/outputs/aar/react-native-webrtc-release.aar
+        libs/react-native-webrtc.aar
+      - cp $$jitsi-meet$$/node_modules/react-native-webrtc/android/build/outputs/aar/react-native-webrtc-release.aar
+        $$matrixsdk$$/matrix-sdk/libs/react-native-webrtc.aar
+      - cp $$jitsi-meet$$/node_modules/react-native-locale-detector/android/build/outputs/aar/react-native-locale-detector-release.aar
+        libs/react-native-locale-detector.aar
+      - cp $$jitsi-meet$$/node_modules/react-native/android/com/facebook/react/react-native/0.50.4/react-native-0.50.4.aar
+        libs/react-native.aar
+      - cp $$jitsi-meet$$/node_modules/react-native-vector-icons/Fonts/*.ttf src/main/assets/fonts/
+      - cp $$jitsi-meet$$/index.android.bundle src/main/assets/
+      - pushd $$matrixsdk$$
+      - gradle clean assembleRelease
+      - popd
+      - cp $$matrixsdk$$/matrix-sdk/build/outputs/aar/matrix-sdk-release-*.aar libs/matrix-sdk.aar
+    ndk: r17b
+
 MaintainerNotes: |-
     Upstream puts their library aars inside the repo, we need build them our self. We truncate instead of deleting them such that the initial gradle clean is successful.
     jitsi-meet needs react-native which we get via npm. This pulls in a few prebuilt binaries for now :-/.
@@ -1779,5 +1846,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: Tags
-CurrentVersion: 0.8.28
-CurrentVersionCode: 82800
+CurrentVersion: 0.8.28a
+CurrentVersionCode: 82801
diff --git a/srclibs/matrixsdk.txt b/srclibs/matrixsdk.txt
index c49eb20181..39d99119a7 100644
--- a/srclibs/matrixsdk.txt
+++ b/srclibs/matrixsdk.txt
@@ -1,2 +1,2 @@
-Repo:https://github.com/matrix-org/matrix-android-sdk
+Repo:https://github.com/Bubu/matrix-android-sdk
 Repo Type:git