diff --git a/.circleci/config.yml b/.circleci/config.yml index d83c601d..1bd2a03e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,13 +1,38 @@ -version: 2.1 - -orbs: - android: circleci/android@0.2.1 +version: 2 jobs: build: - executor: android/android - + working_directory: ~/code + + docker: + - image: circleci/android:api-29-ndk + + environment: + JVM_OPTS: -Xmx4G + steps: - checkout - run: - command: ./gradlew build + name: Create release.keystore.jks + command: openssl aes-256-cbc -d -in "${releaseKeyStore}.encrypted" -k $RELEASE_ENCRYPT_SECRET_KEY -md md5 >> $releaseKeyStore + - run: + name: Create keystore.properies + command: printf 'releaseKeyAlias=%s\nreleaseKeyPassword=%s\nreleaseKeyStore=%s\nreleaseStorePassword=%s' $releaseKeyAlias $releaseKeyPassword $releaseKeyStore $releaseStorePassword > keystore.properties + - restore_cache: + key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} + - run: + name: Fix 'Permission denied' + command: chmod +x ./gradlew + - run: + name: Download Dependencies + command: ./gradlew androidDependencies + - save_cache: + paths: + - ~/.gradle + key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} + - run: + name: Initial build + command: ./gradlew clean resguardRelease --no-daemon --stacktrace + - store_artifacts: + path: app/build/outputs/apk/ + destination: apks/ diff --git a/.gitignore b/.gitignore index 450cd860..44de674f 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,9 @@ captures/ # Keystore files # Uncomment the following line if you do not want to check your keystore files in. -# *.jks +*.jks + +keystore.properties # External native build folder generated in Android Studio 2.2 and later .externalNativeBuild diff --git a/app/7z/7za.dll b/app/7z/7za.dll deleted file mode 100644 index 088f395f..00000000 Binary files a/app/7z/7za.dll and /dev/null differ diff --git a/app/7z/7za.exe b/app/7z/7za.exe deleted file mode 100644 index 2bdd57d2..00000000 Binary files a/app/7z/7za.exe and /dev/null differ diff --git a/app/7z/7zxa.dll b/app/7z/7zxa.dll deleted file mode 100644 index f755fb5c..00000000 Binary files a/app/7z/7zxa.dll and /dev/null differ diff --git a/app/7z/Far/7-ZipEng.hlf b/app/7z/Far/7-ZipEng.hlf deleted file mode 100644 index f5867c85..00000000 --- a/app/7z/Far/7-ZipEng.hlf +++ /dev/null @@ -1,85 +0,0 @@ -.Language=English,English -.PluginContents=7-Zip Plugin - -@Contents -$^#7-Zip Plugin 19.00# -$^#Copyright (c) 1999-2019 Igor Pavlov# - This FAR module performs transparent #archive# processing. -Files in the archive are handled in the same manner as if they -were in a folder. - - ~Extracting from the archive~@Extract@ - - ~Add files to the archive~@Update@ - - ~7-Zip Plugin configuration~@Config@ - - - Web site: #www.7-zip.org# - -@Extract -$ #Extracting from the archive# - -In this dialog you may enter extracting mode. - - Path mode - - #Full pathnames# Extract files with full pathnames. - - #Current pathnames# Extract files with all relative paths. - - #No pathnames# Extract files without folder paths. - - - Overwrite mode - - #Ask before overwrite# Ask before overwriting existing files. - - #Overwrite without prompt# Overwrite existing files without prompt. - - #Skip existing files# Skip extracting of existing files. - - - Files - - #Selected files# Extract only selected files. - - #All files# Extract all files from archive. - -@Update -$ #Add files to the archive# - -This dialog allows you to specify options for process of updating archive. - - - Compression method - - #Store# Files will be copied to archive without compression. - - #Normal# Files will be compressed. - - #Maximum# Files will be compressed with method that gives - maximum compression ratio. - - - Update mode - - #Add and replace files# Add all specified files to the archive. - - #Update and add files# Update older files in the archive and add - files that are new to the archive. - - #Freshen existing files# Update specified files in the archive that - are older than the selected disk files. - - #Synchronize files# Replace specified files only if - added files are newer. Always add those - files, which are not present in the - archive. Delete from archive those files, - which are not present on the disk. - -@Config -$ #7-Zip Plugin configuration# - In this dialog you may change following parameters: - - #Plugin is used by default# Plugin is used by default. diff --git a/app/7z/Far/7-ZipEng.lng b/app/7z/Far/7-ZipEng.lng deleted file mode 100644 index fbd37a41..00000000 --- a/app/7z/Far/7-ZipEng.lng +++ /dev/null @@ -1,211 +0,0 @@ -.Language=English,English - -"Ok" -"&Cancel" - -"Warning" -"Error" - -"Format" - -"Properties" - -"Yes" -"No" - -"Get password" -"Enter password" - -"Extract" -"&Extract to" - -"Path mode" -"&Full pathnames" -"C&urrent pathnames" -"&No pathnames" - -"Overwrite mode" -"As&k before overwrite" -"&Overwrite without prompt" -"Sk&ip existing files" -"A&uto rename" -"A&uto rename existing files" - -"Extract" -"&Selected files" -"A&ll files" - -"&Password" - -"Extr&act" -"&Cancel" - -"Can not open output file '%s'." - -"Unsupported compression method for '%s'." -"CRC failed in '%s'." -"Data error in '%s'." -"CRC failed in encrypted file '%s'. Wrong password?" -"Data error in encrypted file '%s'. Wrong password?" - -"Confirm File Replace" -"Destination folder already contains processed file." -"Would you like to replace the existing file" -"with this one" - -"bytes" -"modified on" - - -"&Yes" -"Yes to &All" -"&No" -"No to A&ll" -"A&uto rename" -"&Cancel" - - -"Update operations are not supported for this archive." - - -"Delete from archive" -"Delete \"%.40s\" from the archive" -"Delete selected files from the archive" -"Delete %d files from the archive" -"Delete" -"Cancel" - -"Add files to archive" - -"Add to %s a&rchive:" - -"Compression method" -"&Store" -"Fas&test" -"&Fast" -"&Normal" -"&Maximum" -"&Ultra" - -"Update mode" -"A&dd and replace files" -"&Update and add files" -"&Freshen existing files" -"S&ynchronize files" - -"&Add" -"Se&lect archiver" - -"Select archive format" - -"Wait" -"Reading the archive" -"Extracting from the archive" -"Deleting from the archive" -"Updating the archive" - -"Move operation is not supported" - -"7-Zip" -"7-Zip (add to archive)" - -"7-Zip" - -"Plugin is used by default" - -"0" -"1" -"2" -"Path" -"Name" -"Extension" -"Is Folder" -"Size" -"Packed Size" -"Attributes" -"Created" -"Accessed" -"Modified" -"Solid" -"Commented" -"Encrypted" -"Splited Before" -"Splited After" -"Dictionary Size" -"CRC" -"Type" -"Anti" -"Method" -"Host OS" -"File System" -"User" -"Group" -"Block" -"Comment" -"Position" -"Path Prefix" -"Folders" -"Files" -"Version" -"Volume" -"Multivolume" -"Offset" -"Links" -"Blocks" -"Volumes" -"Time Type" -"64-bit" -"Big-endian" -"CPU" -"Physical Size" -"Headers Size" -"Checksum" -"Characteristics" -"Virtual Address" -"ID" -"Short Name" -"Creator Application" -"Sector Size" -"Mode" -"Symbolic Link" -"Error" -"Total Size" -"Free Space" -"Cluster Size" -"Label" -"Local Name" -"Provider" -"NT Security" -"Alternate Stream" -"Aux" -"Deleted" -"Tree" -"SHA-1" -"SHA-256" -"Error Type" -"Errors" -"Errors" -"Warnings" -"Warning" -"Streams" -"Alternate Streams" -"Alternate Streams Size" -"Virtual Size" -"Unpack Size" -"Total Physical Size" -"Volume Index" -"SubType" -"Short Comment" -"Code Page" -"Is not archive type" -"Physical Size can't be detected" -"Zeros Tail Is Allowed" -"Tail Size" -"Embedded Stub Size" -"Link" -"Hard Link" -"iNode" -"Stream ID" -"Read-only" -"Out Name" -"Copy Link" diff --git a/app/7z/Far/7-ZipFar.dll b/app/7z/Far/7-ZipFar.dll deleted file mode 100644 index e51058d2..00000000 Binary files a/app/7z/Far/7-ZipFar.dll and /dev/null differ diff --git a/app/7z/Far/7-ZipFar64.dll b/app/7z/Far/7-ZipFar64.dll deleted file mode 100644 index 697af072..00000000 Binary files a/app/7z/Far/7-ZipFar64.dll and /dev/null differ diff --git a/app/7z/Far/7-ZipRus.hlf b/app/7z/Far/7-ZipRus.hlf deleted file mode 100644 index 9dff7464..00000000 --- a/app/7z/Far/7-ZipRus.hlf +++ /dev/null @@ -1,84 +0,0 @@ -.Language=Russian,Russian (Русский) -.PluginContents=Плагин 7-Zip - -@Contents -$^#7-Zip Plugin 19.00# -$^#Copyright (c) 1999-2019 Igor Pavlov# - Этот модуль FAR позволяет работать с #архивами#. Для пользователя -файлы в архивах не отличаются от файлов в папках. - - - ~Распаковка файлов из архива~@Extract@ - - ~Добавление файлов к архиву~@Update@ - - ~Параметры работы с архивами~@Config@ - - - Web site: #www.7-zip.org# - -@Extract -$ #Распаковка файлов из архива# - В этом диалоге вы можете ввести путь для распаковки файлов и задать -режим распаковки. - - Пути - - #Полные пути# Распаковать файлы с полными путями. - - #Относительные пути# Распаковать с относительными путями. - - #Без путей# Распаковать без путей. - - - Перезапись - - #Спрашивать подтверждение# Спрашивать подтверждение на - перезапись существующего файла. - - #Без подтверждения# Замещать существующий файл - без подтверждения. - - #Пропускать# Пропускать существующие файлы. - - - Распаковать - - #Выбранные файлы# Распаковать только выделенные файлы из архива. - - #Все файлы# Распаковать все файлы из архива. - -@Update -$ #Добавление файлов к архиву# - - В этом диалоге вы можете задать режим упаковки. - - - Метод сжатия: - - #Без сжатия# Файлы будут скопированы без сжатия. - - #Нормальное сжатие# Файлы будут сжаты. - - #Максимальное сжатие# Файлы будут сжаты с максимальной - степенью сжатия. - - - Режим изменения: - - #Добавить и заменить# Добавить все выбранные файлы в архив. - - #Обновить и добавить# Обновить устаревшие файлы в архиве и - добавить файлы, которых нет в архиве. - - #Обновить# Обновить устаревшие файлы в архиве. - - #Синхронизировать# Синхронизировать содержимое архива - с выбранными файлами. - - -@Config -$ #Параметры работы с плагином 7-Zip# - В этом диалоге вы можете изменить следующие параметры: - - #Плагин используется по умолчанию# Плагин используется по умолчанию diff --git a/app/7z/Far/7-ZipRus.lng b/app/7z/Far/7-ZipRus.lng deleted file mode 100644 index 7663cfa6..00000000 --- a/app/7z/Far/7-ZipRus.lng +++ /dev/null @@ -1,211 +0,0 @@ -.Language=Russian,Russian (Русский) - -"Продолжить" -"&Отменить" - -"Предупреждение" -"Ошибка" - -"Формат" - -"Свойства" - -"Да" -"Нет" - -"Ввод пароля" -"Введите пароль" - -"Распаковка" -"&Распаковать в" - -"Пути" -"По&лные пути" -"О&тносительные пути" -"&Без путей" - -"Перезапись" -"&Спрашивать подтверждение" -"Б&ез подтверждения" -"Проп&ускать" -"Переименовать автом." -"Переим. автом. существ." - -"Распаковать" -"В&ыбранные файлы" -"Все &файлы" - -"&Пароль" - -"Р&аспаковать" -"&Отменить" - -"Невозможно открыть файл '%s'." - -"Неподдерживаемый метод сжатия для файла '%s'." -"Ошибка CRC в '%s'." -"Ошибка в данных в '%s'." -"Ошибка CRC для зашифрованного файла '%s'. Неверный пароль?" -"Ошибка в данных зашифрованного файла '%s'. Неверный пароль?" - -"Подтвердите замену файла" -"Папка уже содержит обрабатываемый файл." -"Заменить существующий файл" -"следующим файлом" - -"байт" -"изменен" - - -"&Да" -"Да для &всех" -"&Нет" -"Нет для в&сех" -"Переименовать автоматически" -"&Отменить" - - -"Для этого архива операции изменения не поддерживаются." - - -"Удаление из архива" -"Удалить \"%.40s\" из архива" -"Удалить выбранные файлы из архива" -"Удалить %d файлов из архива" -"Удаление" -"Отмена" - -"Добавить файлы к архиву" - -"Добавить к %s &архиву" - -"Метод сжатия" -"Без сжатия" -"Скоростной" -"Быстрый" -"Нормальный" -"Максимальный" -"Ультра" - -"Режим изменения" -"Добавить и заменить" -"Обновить и добавить" -"Обновить" -"Синхронизировать" - -"&Добавить" -"А&рхиватор" - -"Выбор архивного формата" - -"Подождите" -"Чтение архива" -"Распаковка" -"Удаление" -"Изменение" - -"Перемещение файлов не поддерживается" - -"7-Zip" -"7-Zip (добавить в архив)" - -"7-Zip configuration" - -"Плагин используется по умолчанию" - -"0" -"1" -"2" -"Путь" -"Имя" -"Расширение" -"Папка" -"Размер" -"Сжатый" -"Атрибуты" -"Создан" -"Открыт" -"Изменен" -"Непрерывный" -"Комментарий" -"Зашифрован" -"Разбит До" -"Разбит После" -"Словарь" -"CRC" -"Тип" -"Анти" -"Метод" -"Система" -"Файловая Система" -"Пользователь" -"Группа" -"Блок" -"Комментарий" -"Позиция" -"Путь" -"Папок" -"Файлов" -"Версия" -"Том" -"Многотомный" -"Смещение" -"Ссылок" -"Блоков" -"Томов" -"Time Type" -"64-bit" -"Big-endian" -"Процессор" -"Физический Размер" -"Размер Заголовков" -"Контр. Сумма" -"Характеристики" -"Виртуальный Адрес" -"ID" -"Короткое имя" -"Программа" -"Размер сектора" -"Режим" -"Символьная Ссылка" -"Ошибка" -"Емкость" -"Свободно" -"Размер кластера" -"Метка" -"Локальное имя" -"Провайдер" -"NT Безопасность" -"Альтернативный Поток" -"Aux" -"Удаленный" -"Дерево" -"SHA-1" -"SHA-256" -"Тип Ошибки" -"Ошибки" -"Ошибки" -"Предупреждения" -"Предупреждение" -"Потоки" -"Альтернативные Потоки" -"Размер Альтернативных потоков" -"Виртуальный Размер" -"Распакованный Размер" -"Общий Физический Размер" -"Номер Тома" -"Подтип" -"Короткий Комментарий" -"Кодовая Страница" -"Is not archive type" -"Physical Size can't be detected" -"Zeros Tail Is Allowed" -"Размер Остатка" -"Размер Встроенного Блока" -"Ссылка" -"Жесткая Ссылка" -"iNode" -"ID Потока" -"Только для чтения" -"Out Name" -"Copy Link" diff --git a/app/7z/Far/7zToFar.ini b/app/7z/Far/7zToFar.ini deleted file mode 100644 index 684976eb..00000000 --- a/app/7z/Far/7zToFar.ini +++ /dev/null @@ -1,67 +0,0 @@ -; 7z supporting for MutiArc in Far -; Append the following strings to file -; ..\Program Files\Far\Plugins\MultiArc\Formats\Custom.ini - -[7z] -TypeName=7z -ID=37 7A BC AF 27 1C -IDPos= -IDOnly=1 -Extension=7z -List=7z l -- %%AQ -Start="^-----" -End="^-----" -Format0="yyyy tt dd hh mm ss aaaaa zzzzzzzzzzzz pppppppppppp nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn" -Extract=7z x {-p%%P} -r0 -y -scsDOS -i@%%LQMN -- %%A -ExtractWithoutPath=7z e {-p%%P} -r0 -y -scsDOS -i@%%LQMN -- %%A -Test=7z t {-p%%P} -r0 -scsDOS -i@%%LQMN -- %%A -Delete=7z d {-p%%P} -r0 -ms=off -scsDOS -i@%%LQMN -- %%A -Add=7z a {-p%%P} -r0 -t7z {%%S} -scsDOS -i@%%LQMN -- %%A -AddRecurse=7z a {-p%%P} -r0 -t7z {%%S} -scsDOS -i@%%LQMN -- %%A -AllFilesMask="*" - -[rpm] -TypeName=rpm -ID=ED AB EE DB -IDPos= -IDOnly=1 -Extension=rpm -List=7z l -- %%AQ -Start="^-----" -End="^-----" -Format0="yyyy tt dd hh mm ss aaaaa zzzzzzzzzzzz pppppppppppp nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn" -Extract=7z x {-p%%P} -r0 -y -scsDOS -i@%%LQMN -- %%A -ExtractWithoutPath=7z e {-p%%P} -r0 -y -scsDOS -i@%%LQMN -- %%A -Test=7z t {-p%%P} -r0 -scsDOS -i@%%LQMN -- %%A -AllFilesMask="*" - -[cpio] -TypeName=cpio -ID= -IDPos= -IDOnly=0 -Extension=cpio -List=7z l -- %%AQ -Start="^-----" -End="^-----" -Format0="yyyy tt dd hh mm ss aaaaa zzzzzzzzzzzz pppppppppppp nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn" -Extract=7z x {-p%%P} -r0 -y -scsDOS -i@%%LQMN -- %%A -ExtractWithoutPath=7z e {-p%%P} -r0 -y -scsDOS -i@%%LQMN -- %%A -Test=7z t {-p%%P} -r0 -scsDOS -i@%%LQMN -- %%A -AllFilesMask="*" - -[deb] -TypeName=deb -ID= -IDPos= -IDOnly=0 -Extension=deb -List=7z l -- %%AQ -Start="^-----" -End="^-----" -Format0="yyyy tt dd hh mm ss aaaaa zzzzzzzzzzzz pppppppppppp nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn" -Extract=7z x {-p%%P} -r0 -y -scsDOS -i@%%LQMN -- %%A -ExtractWithoutPath=7z e {-p%%P} -r0 -y -scsDOS -i@%%LQMN -- %%A -Test=7z t {-p%%P} -r0 -scsDOS -i@%%LQMN -- %%A -AllFilesMask="*" - diff --git a/app/7z/Far/far7z.reg b/app/7z/Far/far7z.reg deleted file mode 100644 index 105e8f63..00000000 --- a/app/7z/Far/far7z.reg +++ /dev/null @@ -1,67 +0,0 @@ -REGEDIT4 - -[HKEY_LOCAL_MACHINE\SOFTWARE\Far\Plugins\MultiArc\ZIP] -"Extract"="7z x {-p%%P} -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"ExtractWithoutPath"="7z e {-p%%P} -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Test"="7z t {-p%%P} -r0 -scsDOS -i@%%LQMN -- %%A" -"Delete"="7z d {-p%%P} -r0 {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Add"="7z a {-p%%P} -r0 -tzip {-w%%W} {%%S} -scsDOS -i@%%LQMN -- %%A" -"AddRecurse"="7z a {-p%%P} -r0 -tzip {-w%%W} {%%S} -scsDOS -i@%%LQMN -- %%A" -"AllFilesMask"="*" - -[HKEY_LOCAL_MACHINE\SOFTWARE\Far\Plugins\MultiArc\TAR] -"Extract"="7z x -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"ExtractWithoutPath"="7z e -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Test"="7z t -r0 -scsDOS -i@%%LQMN -- %%A" -"Delete"="7z d -r0 {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Add"="7z a -r0 -y -ttar {-w%%W} {%%S} -scsDOS -i@%%LQMN -- %%A" -"AddRecurse"="7z a -r0 -y -ttar {-w%%W} {%%S} -scsDOS -i@%%LQMN -- %%A" -"AllFilesMask"="*" - -[HKEY_LOCAL_MACHINE\SOFTWARE\Far\Plugins\MultiArc\GZIP] -"Extract"="7z x -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"ExtractWithoutPath"="7z e -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Test"="7z t -r0 -scsDOS -i@%%LQMN -- %%A" -"Delete"="7z d -r0 {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Add"="7z a -r0 -tgzip {-w%%W} {%%S} -scsDOS -i@%%LQMN -- %%A" -"AddRecurse"="7z a -r0 -tgzip {-w%%W} {%%S} -scsDOS -i@%%LQMN -- %%A" -"AllFilesMask"="*" - -[HKEY_LOCAL_MACHINE\SOFTWARE\Far\Plugins\MultiArc\BZIP] -"Extract"="7z x -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"ExtractWithoutPath"="7z e -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Test"="7z t -r0 -scsDOS -i@%%LQMN -- %%A" -"Delete"="7z d -r0 {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Add"="7z a -r0 -tbzip2 {-w%%W} {%%S} -scsDOS -i@%%LQMN -- %%A" -"AddRecurse"="7z a -r0 -tbzip2 {-w%%W} {%%S} -scsDOS -i@%%LQMN -- %%A" -"AllFilesMask"="*" - -[HKEY_LOCAL_MACHINE\SOFTWARE\Far\Plugins\MultiArc\ARJ] -"Extract"="7z x -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"ExtractWithoutPath"="7z e -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Test"="7z t -r0 -scsDOS -i@%%LQMN -- %%A" -"AllFilesMask"="*" - -[HKEY_LOCAL_MACHINE\SOFTWARE\Far\Plugins\MultiArc\CAB] -"Extract"="7z x -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"ExtractWithoutPath"="7z e -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Test"="7z t -r0 -scsDOS -i@%%LQMN -- %%A" -"AllFilesMask"="*" - -[HKEY_LOCAL_MACHINE\SOFTWARE\Far\Plugins\MultiArc\LZH] -"Extract"="7z x -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"ExtractWithoutPath"="7z e -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Test"="7z t -r0 -scsDOS -i@%%LQMN -- %%A" -"AllFilesMask"="*" - -[HKEY_LOCAL_MACHINE\SOFTWARE\Far\Plugins\MultiArc\RAR] -"Extract"="7z x -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"ExtractWithoutPath"="7z e -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Test"="7z t -r0 -scsDOS -i@%%LQMN -- %%A" -"AllFilesMask"="*" - -[HKEY_LOCAL_MACHINE\SOFTWARE\Far\Plugins\MultiArc\Z(Unix)] -"Extract"="7z x -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"ExtractWithoutPath"="7z e -r0 -y {-w%%W} -scsDOS -i@%%LQMN -- %%A" -"Test"="7z t -r0 -scsDOS -i@%%LQMN -- %%A" -"AllFilesMask"="*" diff --git a/app/7z/Far/far7z.txt b/app/7z/Far/far7z.txt deleted file mode 100644 index fac709e6..00000000 --- a/app/7z/Far/far7z.txt +++ /dev/null @@ -1,67 +0,0 @@ -7-Zip Plugin for FAR Manager ----------------------------- - -FAR Manager is a file manager working in text mode. -You can download "FAR Manager" from site: -http://www.farmanager.com - -Files: - -far7z.txt - This file -far7z.reg - Regisrty file for MultiArc Plugin -7zToFar.ini - Supporting 7z for MultiArc Plugin -7-ZipFar.dll - 7-Zip Plugin for FAR Manager -7-ZipEng.hlf - Help file in English for FAR Manager -7-ZipRus.hlf - Help file in Russian for FAR Manager -7-ZipEng.lng - Plugin message strings in English for FAR Manager -7-ZipRus.lng - Plugin message strings in Russian for FAR Manager - -There are two ways to use 7-Zip with FAR Manager: - - 1) Via 7-Zip FAR Plugin (it's recommended way). - 2) Via standard MultiArc Plugin. - - -7-Zip FAR Plugin -~~~~~~~~~~~~~~~~ - -7-Zip FAR Plugin is first level plugin for FAR Manager, like MultiArc plugin. -It very fast extracts and updates files in archive, since it doesn't use -external programs. It supports all formats supported by 7-Zip: -7z, ZIP, RAR, CAB, ARJ, GZIP, BZIP2, Z, TAR, CPIO, RPM and DEB. - -To install 7-Zip FAR Plugin: - 1) Create "7-Zip" folder in ...\Program Files\Far\Plugins folder. - 2) Copy all files from "FAR" folder of this package to created folder. - 3) Install 7-Zip, or copy 7z.dll from 7-Zip to Program Files\Far\Plugins\7-Zip\ - 4) Restart FAR. - -You can open archives with one of the following ways: - * Pressing Enter. - * Pressing Ctrl-PgDown. - * Pressing F11 and selecting 7-Zip item. - - -You can create new archives with 7-Zip by pressing F11 and -selecting 7-Zip (add to archive) item. - -If you think that some operations with archives is better to do with MultiArc Plugin, -you can disable 7-Zip plugin via Options / Pligin configuration / 7-Zip. In such mode -opening archives by pressing Enter and Ctrl-PgDown will start MultiArc Plugin. And -if you want to open archive with 7-Zip, press F11 and select 7-Zip item. - - -Using command line 7-Zip via MultiArc Plugin -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -If you want to use 7-Zip via MultiArc Plugin, you must -register file far7z.reg. - -If you want to use 7z archives via MultiArc Plugin, you must -append contents of file Far\7zToFar.ini to file -..\Program Files\Far\Plugins\MultiArc\Formats\Custom.ini. - - -If you want to cancel using 7-Zip by MultiArc, just remove lines that contain -7-Zip (7z) program name from HKEY_LOCAL_MACHINE\SOFTWARE\Far\Plugins\MultiArc\ZIP -registry key. diff --git a/app/7z/License.txt b/app/7z/License.txt deleted file mode 100644 index 48dc6c62..00000000 --- a/app/7z/License.txt +++ /dev/null @@ -1,31 +0,0 @@ - 7-Zip Extra - ~~~~~~~~~~~ - License for use and distribution - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - Copyright (C) 1999-2019 Igor Pavlov. - - 7-Zip Extra files are under the GNU LGPL license. - - - Notes: - You can use 7-Zip Extra on any computer, including a computer in a commercial - organization. You don't need to register or pay for 7-Zip. - - - GNU LGPL information - -------------------- - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You can receive a copy of the GNU Lesser General Public License from - http://www.gnu.org/ - diff --git a/app/7z/history.txt b/app/7z/history.txt deleted file mode 100644 index 2154c3d4..00000000 --- a/app/7z/history.txt +++ /dev/null @@ -1,111 +0,0 @@ -7-Zip Extra history -------------------- - -This file contains only information about changes related to that package exclusively. -The full history of changes is listed in history.txt in main 7-Zip program. - - -19.00 2019-02-21 -------------------------- -- Encryption strength for 7z archives was increased: - the size of random initialization vector was increased from 64-bit to 128-bit, - and the pseudo-random number generator was improved. -- Some bugs were fixed. - - -18.06 2018-12-30 -------------------------- -- The speed for LZMA/LZMA2 compressing was increased by 3-10%, - and there are minor changes in compression ratio. -- Some bugs were fixed. - - -18.05 2018-04-30 -------------------------- -- The speed for LZMA/LZMA2 compressing was increased - by 8% for fastest/fast compression levels and - by 3% for normal/maximum compression levels. - - -18.03 beta 2018-03-04 -------------------------- -- The speed for single-thread LZMA/LZMA2 decoding - was increased by 30% in x64 version and by 3% in x86 version. -- 7-Zip now can use multi-threading for 7z/LZMA2 decoding, - if there are multiple independent data chunks in LZMA2 stream. - - -9.35 beta 2014-12-07 ------------------------------- - - SFX modules were moved to LZMA SDK package. - - -9.34 alpha 2014-06-22 ------------------------------- - - Minimum supported system now is Windows 2000 for EXE and DLL files. - - all EXE and DLL files use msvcrt.dll. - - 7zr.exe now support AES encryption. - - -9.18 2010-11-02 ------------------------------- - - New small SFX module for installers. - - -9.17 2010-10-04 ------------------------------- - - New 7-Zip plugin for FAR Manager x64. - - -9.10 2009-12-30 ------------------------------- - - 7-Zip for installers now supports LZMA2. - - -9.09 2009-12-12 ------------------------------- - - LZMA2 compression method support. - - Some bugs were fixed. - - -4.65 2009-02-03 ------------------------------- - - Some bugs were fixed. - - -4.38 beta 2006-04-13 ------------------------------- - - SFX for installers now supports new properties in config file: - Progress, Directory, ExecuteFile, ExecuteParameters. - - -4.34 beta 2006-02-27 ------------------------------- - - ISetProperties::SetProperties: - it's possible to specify desirable number of CPU threads: - PROPVARIANT: name=L"mt", vt = VT_UI4, ulVal = NumberOfThreads - If "mt" is not defined, 7za.dll will check number of processors in system to set - number of desirable threads. - Now 7za.dll can use: - 2 threads for LZMA compressing - N threads for BZip2 compressing - 4 threads for BZip2 decompressing - Other codecs use only one thread. - Note: 7za.dll can use additional "small" threads with low CPU load. - - It's possible to call ISetProperties::SetProperties to specify "mt" property for decoder. - - -4.33 beta 2006-02-05 ------------------------------- - - Compressing speed and Memory requirements were increased. - Default dictionary size was increased: Fastest: 64 KB, Fast: 1 MB, - Normal: 4 MB, Max: 16 MB, Ultra: 64 MB. - - 7z/LZMA now can use only these match finders: HC4, BT2, BT3, BT4 - - -4.27 2005-09-21 ------------------------------- - - Some GUIDs/interfaces were changed. - IStream.h: - ISequentialInStream::Read now works as old ReadPart - ISequentialOutStream::Write now works as old WritePart diff --git a/app/7z/readme.txt b/app/7z/readme.txt deleted file mode 100644 index a54a3133..00000000 --- a/app/7z/readme.txt +++ /dev/null @@ -1,124 +0,0 @@ -7-Zip Extra 19.00 ------------------ - -7-Zip Extra is package of extra modules of 7-Zip. - -7-Zip Copyright (C) 1999-2019 Igor Pavlov. - -7-Zip is free software. Read License.txt for more information about license. - -Source code of binaries can be found at: - http://www.7-zip.org/ - -This package contains the following files: - -7za.exe - standalone console version of 7-Zip with reduced formats support. -7za.dll - library for working with 7z archives -7zxa.dll - library for extracting from 7z archives -License.txt - license information -readme.txt - this file - -Far\ - plugin for Far Manager -x64\ - binaries for x64 - - -All 32-bit binaries can work in: - Windows 2000 / 2003 / 2008 / XP / Vista / 7 / 8 / 10 - and in any Windows x64 version with WoW64 support. -All x64 binaries can work in any Windows x64 version. - -All binaries use msvcrt.dll. - -7za.exe -------- - -7za.exe - is a standalone console version of 7-Zip with reduced formats support. - - Extra: 7za.exe : support for only some formats of 7-Zip. - 7-Zip: 7z.exe with 7z.dll : support for all formats of 7-Zip. - -7za.exe and 7z.exe from 7-Zip have same command line interface. -7za.exe doesn't use external DLL files. - -You can read Help File (7-zip.chm) from 7-Zip package for description -of all commands and switches for 7za.exe and 7z.exe. - -7za.exe features: - - - High compression ratio in 7z format - - Supported formats: - - Packing / unpacking: 7z, xz, ZIP, GZIP, BZIP2 and TAR - - Unpacking only: Z, lzma, CAB. - - Highest compression ratio for ZIP and GZIP formats. - - Fast compression and decompression - - Strong AES-256 encryption in 7z and ZIP formats. - -Note: LZMA SDK contains 7zr.exe - more reduced version of 7za.exe. -But you can use 7zr.exe as "public domain" code. - - - -DLL files ---------- - -7za.dll and 7zxa.dll are reduced versions of 7z.dll from 7-Zip. -7za.dll and 7zxa.dll support only 7z format. -Note: 7z.dll is main DLL file that works with all archive types in 7-Zip. - -7za.dll and 7zxa.dll support the following decoding methods: - - LZMA, LZMA2, PPMD, BCJ, BCJ2, COPY, 7zAES, BZip2, Deflate. - -7za.dll also supports 7z encoding with the following encoding methods: - - LZMA, LZMA2, PPMD, BCJ, BCJ2, COPY, 7zAES. - -7za.dll and 7zxa.dll work via COM interfaces. -But these DLLs don't use standard COM interfaces for objects creating. - -Look also example code that calls DLL functions (in source code of 7-Zip): - - 7zip\UI\Client7z - -Another example of binary that uses these interface is 7-Zip itself. -The following binaries from 7-Zip use 7z.dll: - - 7z.exe (console version) - - 7zG.exe (GUI version) - - 7zFM.exe (7-Zip File Manager) - -Note: The source code of LZMA SDK also contains the code for similar DLLs -(DLLs without BZip2, Deflate support). And these files from LZMA SDK can be -used as "public domain" code. If you use LZMA SDK files, you don't need to -follow GNU LGPL rules, if you want to change the code. - - - - -License FAQ ------------ - -Can I use the EXE or DLL files from 7-Zip in a commercial application? -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Yes, but you are required to specify in documentation for your application: - (1) that you used parts of the 7-Zip program, - (2) that 7-Zip is licensed under the GNU LGPL license and - (3) you must give a link to www.7-zip.org, where the source code can be found. - - -Can I use the source code of 7-Zip in a commercial application? -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Since 7-Zip is licensed under the GNU LGPL you must follow the rules of that license. -In brief, it means that any LGPL'ed code must remain licensed under the LGPL. -For instance, you can change the code from 7-Zip or write a wrapper for some -code from 7-Zip and compile it into a DLL; but, the source code of that DLL -(including your modifications / additions / wrapper) must be licensed under -the LGPL or GPL. -Any other code in your application can be licensed as you wish. This scheme allows -users and developers to change LGPL'ed code and recompile that DLL. That is the -idea of free software. Read more here: http://www.gnu.org/. - - - -Note: You can look also LZMA SDK, which is available under a more liberal license. - - ---- -End of document diff --git a/app/7z/x64/7za.dll b/app/7z/x64/7za.dll deleted file mode 100644 index bc2b47a3..00000000 Binary files a/app/7z/x64/7za.dll and /dev/null differ diff --git a/app/7z/x64/7za.exe b/app/7z/x64/7za.exe deleted file mode 100644 index 9f27b20e..00000000 Binary files a/app/7z/x64/7za.exe and /dev/null differ diff --git a/app/7z/x64/7zxa.dll b/app/7z/x64/7zxa.dll deleted file mode 100644 index d51e3f0d..00000000 Binary files a/app/7z/x64/7zxa.dll and /dev/null differ diff --git a/app/build.gradle b/app/build.gradle index cd978b46..bc8e9a8e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,21 +1,21 @@ +apply plugin: 'com.android.application' +apply plugin: 'AndResGuard' +apply plugin: 'io.michaelrocks.paranoid' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' + buildscript { repositories { jcenter() google() } dependencies { - classpath 'io.michaelrocks:paranoid-gradle-plugin:0.2.5' classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.17' + classpath 'io.michaelrocks:paranoid-gradle-plugin:0.2.5' } } -apply plugin: 'AndResGuard' -apply plugin: 'com.android.application' -apply plugin: 'io.michaelrocks.paranoid' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' - andResGuard { mappingFile = null use7zip = true @@ -35,7 +35,8 @@ andResGuard { "*.webp", "resources.arsc"] sevenzip { - path = "C:/Users/xppxu/AndroidStudioProjects/TiebaLite/app/7z/7za.exe" + artifact = 'com.tencent.mm:SevenZip:1.2.10' + //path = "C:/Users/xppxu/AndroidStudioProjects/TiebaLite/app/7z/7za.exe" } /** @@ -45,13 +46,17 @@ andResGuard { digestalg = "SHA-256" } +def keystorePropertiesFile = rootProject.file("keystore.properties") +def keystoreProperties = new Properties() +keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + android { signingConfigs { - config { - keyAlias 'androiddebugkey' - keyPassword '123456789a' - storeFile file('D:/Sign/files/testkey.jks') - storePassword 'android' + release { + keyAlias keystoreProperties['releaseKeyAlias'] + keyPassword keystoreProperties['releaseKeyPassword'] + storeFile file(rootDir.getCanonicalPath() + '/' + keystoreProperties['releaseKeyStore']) + storePassword keystoreProperties['releaseStorePassword'] v2SigningEnabled true } } @@ -72,7 +77,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' debuggable false jniDebuggable false - signingConfig signingConfigs.config + signingConfig signingConfigs.release zipAlignEnabled true multiDexEnabled true } diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/WebViewFragment.java b/app/src/main/java/com/huanchengfly/tieba/post/fragments/WebViewFragment.java index 0600fedb..451ea0f4 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/WebViewFragment.java +++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/WebViewFragment.java @@ -58,8 +58,7 @@ import java.util.List; import static com.huanchengfly.tieba.post.utils.FileUtil.FILE_TYPE_DOWNLOAD; public class WebViewFragment extends BaseFragment implements DownloadListener { - - public static final String TAG = "WebViewFragment"; + public static final String TAG = WebViewFragment.class.getSimpleName(); private static final String DEFAULT_TITLE = "ш┤┤хРз Lite"; private final static int FILE_CHOOSER_RESULT_CODE = 1; private String mUrl; @@ -75,7 +74,6 @@ public class WebViewFragment extends BaseFragment implements DownloadListener { private NavigationHelper navigationHelper; private ValueCallback uploadMessage; private ValueCallback uploadMessageAboveL; - private HistoryHelper helper; private SwipeRefreshLayout swipeRefreshLayout; public WebViewFragment() { @@ -127,7 +125,6 @@ public class WebViewFragment extends BaseFragment implements DownloadListener { private boolean isEnabledLocationFunction() { int locationMode = 0; - String locationProviders; try { locationMode = Settings.Secure.getInt(getAttachContext().getContentResolver(), Settings.Secure.LOCATION_MODE); } catch (Settings.SettingNotFoundException e) { @@ -198,7 +195,7 @@ public class WebViewFragment extends BaseFragment implements DownloadListener { @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - helper = new HistoryHelper(getAttachContext()); + HistoryHelper helper = new HistoryHelper(getAttachContext()); initData(); Bundle bundle = getArguments(); navigationHelper = NavigationHelper.newInstance(getAttachContext()); @@ -289,7 +286,7 @@ public class WebViewFragment extends BaseFragment implements DownloadListener { Intent i = new Intent(Intent.ACTION_GET_CONTENT); i.addCategory(Intent.CATEGORY_OPENABLE); i.setType("image/*"); - startActivityForResult(Intent.createChooser(i, "щАЙцЛйхЫ╛чЙЗ"), FILE_CHOOSER_RESULT_CODE); + startActivityForResult(Intent.createChooser(i, getAttachContext().getString(R.string.title_select_pic)), FILE_CHOOSER_RESULT_CODE); } @Override @@ -341,14 +338,6 @@ public class WebViewFragment extends BaseFragment implements DownloadListener { injectJavaScript(); } - @Override - public WebResourceResponse shouldInterceptRequest(WebView view, String url) { - if (url.contains("//hm.baidu.com/")) { - return AssetUtil.getEmptyResponse(); - } - return null; - } - @Override public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) { String url = request.getUrl().toString(); @@ -379,6 +368,7 @@ public class WebViewFragment extends BaseFragment implements DownloadListener { } private class ChromeClient extends WebChromeClient { + @SuppressLint("WrongConstant") @Override public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) { Uri uri = Uri.parse(mWebView.getUrl()); @@ -417,7 +407,7 @@ public class WebViewFragment extends BaseFragment implements DownloadListener { @Override public boolean onJsAlert(WebView webView, String url, String message, JsResult result) { DialogUtil.build(webView.getContext()) - .setMessage(message).setPositiveButton("чбохоЪ", null) + .setMessage(message).setPositiveButton(R.string.button_sure_default, null) .setCancelable(false) .create().show(); result.confirm(); diff --git a/build.gradle b/build.gradle index 32e811ba..bb99febf 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ buildscript { maven { url 'https://maven.aliyun.com/repository/google' } maven { url 'https://maven.aliyun.com/repository/jcenter' } maven { url 'http://maven.aliyun.com/nexus/content/groups/public' } + maven { url 'https://plugins.gradle.org/m2/' } } dependencies { classpath 'com.android.tools.build:gradle:3.5.3' diff --git a/release.keystore.jks.encrypted b/release.keystore.jks.encrypted new file mode 100644 index 00000000..53cd2fc1 Binary files /dev/null and b/release.keystore.jks.encrypted differ