From ddc985b82f5243630173c4e8a456d2553c4c5baa Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Tue, 18 Feb 2020 22:18:18 +0100 Subject: [PATCH 1/4] app head: following rework --- app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app b/app index 1f649b9d..dbaaf66b 160000 --- a/app +++ b/app @@ -1 +1 @@ -Subproject commit 1f649b9d38129cbfc2a9d4acfe26bf5adbb527af +Subproject commit dbaaf66bb064e7af5b976b2966b115e214492d92 -- 2.45.3 From b90763b473c09b5cdbdd2d732ac7da86b2cb3597 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Fri, 21 Feb 2020 00:21:52 +0100 Subject: [PATCH 2/4] sdk 0.60.0. app head: following rework changes. --- .gitlab-ci.yml | 4 ++-- app | 2 +- buildozer.spec.arm.ci | 5 ++++- buildozer.spec.arm64.ci | 5 ++++- buildozer.spec.sample | 5 ++++- buildozer.spec.vagrant | 5 ++++- src/main/java/io/lbry/browser/ServiceHelper.java | 4 +++- 7 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ecf03787..2577e24c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: build arm64 apk: stage: build - image: lbry/android-base:latest + image: lbry/android-base:platform-28 before_script: - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - git submodule sync --recursive @@ -37,7 +37,7 @@ build arm64 apk: build arm apk: stage: build2 - image: lbry/android-base:latest + image: lbry/android-base:platform-28 before_script: - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - git submodule sync --recursive diff --git a/app b/app index dbaaf66b..647d7e6a 160000 --- a/app +++ b/app @@ -1 +1 @@ -Subproject commit dbaaf66bb064e7af5b976b2966b115e214492d92 +Subproject commit 647d7e6a938cd763ac10887e3cf629175898a48b diff --git a/buildozer.spec.arm.ci b/buildozer.spec.arm.ci index 263e91d0..7f538d97 100644 --- a/buildozer.spec.arm.ci +++ b/buildozer.spec.arm.ci @@ -9,6 +9,9 @@ package.name = browser # (str) Package domain (needed for android/ios packaging) package.domain = io.lbry +# Temporary +package.type = application + # (str) Source code where the main.py live source.dir = ./src/main/python @@ -36,7 +39,7 @@ version.filename = %(source.dir)s/main.py # (list) Application requirements # comma seperated e.g. requirements = sqlite3,kivy -requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.56.0#egg=lbry" +requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.60.0#egg=lbry" # (str) Custom source folders for requirements # Sets custom source for any requirements with recipes diff --git a/buildozer.spec.arm64.ci b/buildozer.spec.arm64.ci index c42b8f05..661c4506 100644 --- a/buildozer.spec.arm64.ci +++ b/buildozer.spec.arm64.ci @@ -9,6 +9,9 @@ package.name = browser # (str) Package domain (needed for android/ios packaging) package.domain = io.lbry +# Temporary +package.type = application + # (str) Source code where the main.py live source.dir = ./src/main/python @@ -36,7 +39,7 @@ version.filename = %(source.dir)s/main.py # (list) Application requirements # comma seperated e.g. requirements = sqlite3,kivy -requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.56.0#egg=lbry" +requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.60.0#egg=lbry" # (str) Custom source folders for requirements # Sets custom source for any requirements with recipes diff --git a/buildozer.spec.sample b/buildozer.spec.sample index 3344a6de..47459cec 100644 --- a/buildozer.spec.sample +++ b/buildozer.spec.sample @@ -9,6 +9,9 @@ package.name = browser # (str) Package domain (needed for android/ios packaging) package.domain = io.lbry +# Temporary +package.type = application + # (str) Source code where the main.py live source.dir = ./src/main/python @@ -36,7 +39,7 @@ version.filename = %(source.dir)s/main.py # (list) Application requirements # comma seperated e.g. requirements = sqlite3,kivy -requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.56.0#egg=lbry" +requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.60.0#egg=lbry" # (str) Custom source folders for requirements # Sets custom source for any requirements with recipes diff --git a/buildozer.spec.vagrant b/buildozer.spec.vagrant index 8b284a12..1f2873c6 100644 --- a/buildozer.spec.vagrant +++ b/buildozer.spec.vagrant @@ -9,6 +9,9 @@ package.name = browser # (str) Package domain (needed for android/ios packaging) package.domain = io.lbry +# Temporary +package.type = application + # (str) Source code where the main.py live source.dir = ./src/main/python @@ -36,7 +39,7 @@ version.filename = %(source.dir)s/main.py # (list) Application requirements # comma seperated e.g. requirements = sqlite3,kivy -requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.56.0#egg=lbry" +requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.60.0#egg=lbry" # (str) Custom source folders for requirements # Sets custom source for any requirements with recipes diff --git a/src/main/java/io/lbry/browser/ServiceHelper.java b/src/main/java/io/lbry/browser/ServiceHelper.java index 1ce4bb9e..2f76351c 100644 --- a/src/main/java/io/lbry/browser/ServiceHelper.java +++ b/src/main/java/io/lbry/browser/ServiceHelper.java @@ -13,6 +13,8 @@ import java.io.FileOutputStream; import java.io.IOException; public class ServiceHelper { + + public static final String SHARED_PREFERENCES_NAME = "LBRY"; private static final String TAG = "io.lbry.browser.ServiceHelper"; @@ -34,7 +36,7 @@ public class ServiceHelper { public static void start(final Context ctx, String pythonServiceArgument, Class serviceClass, String pythonName) { // always check initial headers status before starting the service - final SharedPreferences sp = ctx.getSharedPreferences(MainActivity.SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE); + final SharedPreferences sp = ctx.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE); boolean initHeaders = sp.getBoolean(HEADERS_ASSET_KEY, false); if (initHeaders) { // initial headers asset copy already done. simply start the service -- 2.45.3 From 24be74765ef67fb593d97ce3babfafcf24c88e27 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Fri, 21 Feb 2020 17:15:45 +0100 Subject: [PATCH 3/4] app head: search and related content fixes --- app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app b/app index 647d7e6a..24f9fa16 160000 --- a/app +++ b/app @@ -1 +1 @@ -Subproject commit 647d7e6a938cd763ac10887e3cf629175898a48b +Subproject commit 24f9fa16679836aad1f21acdccf03325907fd07e -- 2.45.3 From 21403e89f0557561b66ad29fe55d960cee221bc4 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Mon, 24 Feb 2020 15:19:02 +0100 Subject: [PATCH 4/4] app head: following rework updates --- app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app b/app index 24f9fa16..e57931d3 160000 --- a/app +++ b/app @@ -1 +1 @@ -Subproject commit 24f9fa16679836aad1f21acdccf03325907fd07e +Subproject commit e57931d353fed495b617f8a35c912657aff348cd -- 2.45.3