Commit graph

107 commits

Author SHA1 Message Date
Javi Rueda
91a6c028a6 Merge from upstream and fix conflicts 2021-03-16 12:00:55 +01:00
Akinwale Ariwodola
24862550a1 bumpversion 0.16.14 --> 0.17.0 2021-03-16 09:24:33 +01:00
Akinwale Ariwodola
b675dbad9b Merge branch 'master' of https://github.com/lbryio/lbry-android 2021-03-16 08:59:42 +01:00
Javi Rueda
052197e1e3
Merge from upstream and fix conflicts 2021-03-13 06:12:11 +01:00
Akinwale Ariwodola
a655d0112b
PR cleanup (#1164)
* simplify code for readability
* code-cleanup. Make non-changing variables final
* Bump buildToolsVersion 29.0.1 -> 29.0.2 for FDroid build compability
* Set gradle version to static 3.6.4 instead of dynamic 3.+
* Use StandardCharsets.UTF_8 instead of string UTF8
* Remove unused imports
* Add missing null check

Co-authored-by: Patric Karlström <patric@pkcab.eu>
2021-03-08 20:15:23 +01:00
Akinwale Ariwodola
493c771e94 sdk 0.91.0 2021-03-08 19:52:15 +01:00
Javi Rueda
41378f9d83 Update version to release as fast as possible a fix to wake_lock crash 2021-02-04 00:26:14 +01:00
Javi Rueda
2223b242ed
Merge upstream and fix conflicts 2021-01-26 20:29:27 +01:00
Akinwale Ariwodola
6fa308ef96 bumpversion 0.16.13 --> 0.16.14 2021-01-25 18:54:00 +01:00
Akinwale Ariwodola
f3e513fc2d Update translations and content filters 2021-01-25 18:52:21 +01:00
Akinwale Ariwodola
d72a8faec4 sdk 0.88.0 2021-01-23 19:23:11 +01:00
Javi Rueda
2f1bed9646
Fix conflicts after merging from upstream 2021-01-12 18:48:19 +01:00
Akinwale Ariwodola
bdf8a58818 bumpversion 0.16.12 --> 0.16.13 2021-01-12 09:11:26 +01:00
Akinwale Ariwodola
28212808f8
Merge pull request #1115 from pakar/master
Upgrade ExoPlayer from 2.11.4 to 2.12.2
2021-01-12 08:35:04 +01:00
Javi Rueda
4d775d3a17 Fix NoSuchMethod exception for HelperSHA256 on API Level prior to P 2021-01-11 20:44:03 +01:00
Patric Karlström
fd94ef9fa7 Upgrade ExoPlayer from 2.11.4 to 2.12.2 2021-01-11 01:10:23 +01:00
Javi Rueda
2393248b3d Merge upstream lbryio/lbry-android 2020-12-29 08:59:43 +01:00
Akinwale Ariwodola
136853853a bumpversion 0.16.11 --> 0.16.12 2020-12-29 07:02:13 +01:00
Akinwale Ariwodola
b1e0b9af33 sdk 0.87.0. Show confirmation for unfollow. 2020-12-29 06:47:10 +01:00
Javi Rueda
02bbbb49fb Remove Google Cast feature as it depends on GMS 2020-12-28 11:16:11 +01:00
Javi Rueda
82a9feb7f8 Fix duplicate class error on Jetified Protobuf 2020-12-18 15:35:15 +01:00
Javi Rueda
1ffe051525 Exclude GMS dependency injection 2020-12-18 15:12:36 +01:00
Javi Rueda
4c9f037ecc Fix conflicts on merging 2020-12-18 14:46:35 +01:00
Akinwale Ariwodola
df1e8abf50
Merge pull request #1067 from kekkyojin/use-apache-hex
Replace Hex class from GMS with the one from Apache
2020-12-18 12:20:42 +01:00
Javi Rueda
601031e55d Replace Hex class from GMS with the one from Apache 2020-12-14 18:17:13 +01:00
Javi Rueda
d0dd88a17b Merge branch 'master' of https://github.com/lbryio/lbry-android 2020-12-13 21:01:44 +01:00
Akinwale Ariwodola
a9aadbe6a8 bumpversion 0.16.10 --> 0.16.11 2020-12-13 18:08:10 +01:00
Javi Rueda
8f3c2cd82c Merge branch 'master' of https://github.com/lbryio/lbry-android 2020-12-09 17:52:53 +01:00
Javi Rueda
914a61b564 Fix conflicts 2020-12-09 11:55:01 +01:00
Akinwale Ariwodola
c1324efb41 bumpversion 0.16.9 --> 0.16.10 2020-12-09 11:47:58 +01:00
Akinwale Ariwodola
f1b167693d SDK 0.86.1. is_seen vs is_read swap. Fix error condition where wallet sync starts if the wallet is not ready. 2020-12-09 10:59:25 +01:00
Javi Rueda
036516e73c Fix conflicts for merging 2020-11-29 19:33:58 +01:00
Akinwale Ariwodola
c179243d22 update dependencies 2020-11-26 00:04:37 +01:00
Javi Rueda
bda29ab32a Merge branch 'master' of https://github.com/lbryio/lbry-android 2020-10-16 19:43:22 +02:00
Akinwale Ariwodola
ac5e666369 bumpversion 0.16.8 --> 0.16.9 2020-10-16 06:58:57 +01:00
Akinwale Ariwodola
5f850685d6 bumpversion 0.16.7 --> 0.16.8 2020-10-12 11:48:24 +01:00
Javi Rueda
e024876163 Merge from upstream 2020-10-09 17:12:13 +02:00
Akinwale Ariwodola
ff8ffda3c6 bumpversion 0.16.6 --> 0.16.7 2020-10-09 07:39:46 +01:00
Javi Rueda
91ff53bfc8 Merge from upstream 2020-10-05 21:03:29 +02:00
Akinwale Ariwodola
6e8c38cace update module versions 2020-10-05 16:56:17 +01:00
Akinwale Ariwodola
ca64db0499 sdk 0.82.0 2020-10-01 12:42:48 +01:00
Javi Rueda
88c2c11a01 Disable 64-bit builds so more devices could update to the newest version 2020-09-29 10:02:11 +02:00
Javi Rueda
34c4856f45 Merge branch 'master' of https://github.com/lbryio/lbry-android 2020-09-29 09:45:14 +02:00
Akinwale Ariwodola
a5d4eda4d1 bumpversion 0.16.5 --> 0.16.6 2020-09-25 14:45:48 +01:00
Akinwale Ariwodola
1b88f565af bumpversion 0.16.4 --> 0.16.5 2020-09-23 16:37:41 +01:00
Javi Rueda
f5c1068052 Merge branch 'master' of https://github.com/lbryio/lbry-android
# Conflicts:
#	app/src/main/java/io/lbry/browser/MainActivity.java
2020-09-21 13:35:51 +02:00
Akinwale Ariwodola
66c4c00215 bumpversion 0.16.3 --> 0.16.4 2020-09-18 14:54:59 +01:00
Akinwale Ariwodola
8196b69211 bumpversion 0.16.2 --> 0.16.3 2020-09-14 11:20:47 +01:00
Akinwale Ariwodola
adb5ffa8d0 exclude x86_64 lib from build 2020-09-14 11:06:39 +01:00
Javi Rueda
3040cdbe33 Merge upstream, fix conflicts and remove dependencies 2020-09-11 22:51:39 +02:00