Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
64da9281
Commit
64da9281
authored
Sep 30, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show progress while downloading modules
parent
ab7fd979
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
60 additions
and
20 deletions
+60
-20
ProcessRepoZip.java
...main/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java
+50
-10
strings.xml
app/src/main/res/values-de/strings.xml
+1
-1
strings.xml
app/src/main/res/values-es/strings.xml
+1
-1
strings.xml
app/src/main/res/values-fr/strings.xml
+1
-1
strings.xml
app/src/main/res/values-nl/strings.xml
+1
-1
strings.xml
app/src/main/res/values-pl/strings.xml
+1
-1
strings.xml
app/src/main/res/values-ru/strings.xml
+1
-1
strings.xml
app/src/main/res/values-tr/strings.xml
+1
-1
strings.xml
app/src/main/res/values-uk/strings.xml
+1
-1
strings.xml
app/src/main/res/values-zh-rTW/strings.xml
+1
-1
strings.xml
app/src/main/res/values/strings.xml
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java
View file @
64da9281
...
@@ -6,6 +6,7 @@ import android.app.ProgressDialog;
...
@@ -6,6 +6,7 @@ import android.app.ProgressDialog;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.Environment
;
import
android.os.Environment
;
import
android.support.annotation.NonNull
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.magisk.FlashActivity
;
import
com.topjohnwu.magisk.FlashActivity
;
...
@@ -21,16 +22,21 @@ import java.io.BufferedOutputStream;
...
@@ -21,16 +22,21 @@ import java.io.BufferedOutputStream;
import
java.io.File
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileInputStream
;
import
java.io.FileOutputStream
;
import
java.io.FileOutputStream
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.io.OutputStream
;
import
java.io.OutputStream
;
import
java.net.HttpURLConnection
;
import
java.net.HttpURLConnection
;
public
class
ProcessRepoZip
extends
ParallelTask
<
Void
,
Void
,
Boolean
>
{
public
class
ProcessRepoZip
extends
ParallelTask
<
Void
,
Object
,
Boolean
>
{
private
ProgressDialog
progressDialog
;
private
ProgressDialog
progressDialog
;
private
boolean
mInstall
;
private
boolean
mInstall
;
private
String
mLink
;
private
String
mLink
;
private
File
mFile
;
private
File
mFile
;
private
int
progress
=
0
,
total
;
private
static
final
int
UPDATE_DL_PROG
=
0
;
private
static
final
int
SHOW_PROCESSING
=
1
;
public
ProcessRepoZip
(
Activity
context
,
String
link
,
String
filename
,
boolean
install
)
{
public
ProcessRepoZip
(
Activity
context
,
String
link
,
String
filename
,
boolean
install
)
{
super
(
context
);
super
(
context
);
...
@@ -43,15 +49,23 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
...
@@ -43,15 +49,23 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
@Override
@Override
protected
void
onPreExecute
()
{
protected
void
onPreExecute
()
{
Activity
activity
=
getActivity
();
Activity
activity
=
getActivity
();
progressDialog
=
ProgressDialog
.
show
(
activity
,
progressDialog
=
ProgressDialog
.
show
(
activity
,
activity
.
getString
(
R
.
string
.
zip_download_title
),
activity
.
getString
(
R
.
string
.
zip_download_msg
,
0
));
activity
.
getString
(
R
.
string
.
zip_download_title
),
activity
.
getString
(
R
.
string
.
zip_download_msg
));
}
}
@Override
@Override
protected
void
onProgressUpdate
(
Void
...
values
)
{
protected
void
onProgressUpdate
(
Object
...
values
)
{
progressDialog
.
setTitle
(
R
.
string
.
zip_process_title
);
int
mode
=
(
int
)
values
[
0
];
progressDialog
.
setMessage
(
getActivity
().
getString
(
R
.
string
.
zip_process_msg
));
switch
(
mode
)
{
case
UPDATE_DL_PROG:
int
add
=
(
int
)
values
[
1
];
progress
+=
add
;
progressDialog
.
setMessage
(
getActivity
().
getString
(
R
.
string
.
zip_download_msg
,
100
*
progress
/
total
));
break
;
case
SHOW_PROCESSING:
progressDialog
.
setTitle
(
R
.
string
.
zip_process_title
);
progressDialog
.
setMessage
(
getActivity
().
getString
(
R
.
string
.
zip_process_msg
));
break
;
}
}
}
@Override
@Override
...
@@ -63,7 +77,8 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
...
@@ -63,7 +77,8 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
// Request zip from Internet
// Request zip from Internet
HttpURLConnection
conn
=
WebService
.
request
(
mLink
,
null
);
HttpURLConnection
conn
=
WebService
.
request
(
mLink
,
null
);
if
(
conn
==
null
)
return
false
;
if
(
conn
==
null
)
return
false
;
InputStream
in
=
new
BufferedInputStream
(
conn
.
getInputStream
());
total
=
conn
.
getContentLength
();
InputStream
in
=
new
ProgressUpdateInputStream
(
conn
.
getInputStream
());
// Temp files
// Temp files
File
temp1
=
new
File
(
activity
.
getCacheDir
(),
"1.zip"
);
File
temp1
=
new
File
(
activity
.
getCacheDir
(),
"1.zip"
);
...
@@ -74,7 +89,7 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
...
@@ -74,7 +89,7 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
ZipUtils
.
removeTopFolder
(
in
,
temp1
);
ZipUtils
.
removeTopFolder
(
in
,
temp1
);
conn
.
disconnect
();
conn
.
disconnect
();
publishProgress
();
publishProgress
(
SHOW_PROCESSING
);
// Then sign the zip for the first time, temp1 -> temp2
// Then sign the zip for the first time, temp1 -> temp2
ZipUtils
.
signZip
(
activity
,
temp1
,
temp2
,
false
);
ZipUtils
.
signZip
(
activity
,
temp1
,
temp2
,
false
);
...
@@ -128,8 +143,33 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
...
@@ -128,8 +143,33 @@ public class ProcessRepoZip extends ParallelTask<Void, Void, Boolean> {
}
}
@Override
@Override
public
ParallelTask
<
Void
,
Void
,
Boolean
>
exec
(
Void
...
voids
)
{
public
ParallelTask
<
Void
,
Object
,
Boolean
>
exec
(
Void
...
voids
)
{
Utils
.
runWithPermission
(
getActivity
(),
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
,
()
->
super
.
exec
(
voids
));
Utils
.
runWithPermission
(
getActivity
(),
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
,
()
->
super
.
exec
(
voids
));
return
this
;
return
this
;
}
}
private
class
ProgressUpdateInputStream
extends
BufferedInputStream
{
ProgressUpdateInputStream
(
@NonNull
InputStream
in
)
{
super
(
in
);
}
@Override
public
synchronized
int
read
()
throws
IOException
{
publishProgress
(
UPDATE_DL_PROG
,
1
);
return
super
.
read
();
}
@Override
public
int
read
(
@NonNull
byte
[]
b
)
throws
IOException
{
return
read
(
b
,
0
,
b
.
length
);
}
@Override
public
synchronized
int
read
(
@NonNull
byte
[]
b
,
int
off
,
int
len
)
throws
IOException
{
int
read
=
super
.
read
(
b
,
off
,
len
);
publishProgress
(
UPDATE_DL_PROG
,
read
);
return
read
;
}
}
}
}
app/src/main/res/values-de/strings.xml
View file @
64da9281
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
<string
name=
"process_error"
>
Prozessfehler
</string>
<string
name=
"process_error"
>
Prozessfehler
</string>
<string
name=
"internal_storage"
>
Die zip-Datei ist gespeichert unter:\n[Interner Speicher]%1$s
</string>
<string
name=
"internal_storage"
>
Die zip-Datei ist gespeichert unter:\n[Interner Speicher]%1$s
</string>
<string
name=
"zip_download_title"
>
Herunterladen
</string>
<string
name=
"zip_download_title"
>
Herunterladen
</string>
<string
name=
"zip_download_msg"
>
Lade Zip-Datei herunter…
</string>
<string
name=
"zip_download_msg"
>
Lade Zip-Datei herunter
(%1$d%%)
…
</string>
<string
name=
"zip_process_title"
>
Verarbeite
</string>
<string
name=
"zip_process_title"
>
Verarbeite
</string>
<string
name=
"zip_process_msg"
>
Verarbeite Zip-Datei…
</string>
<string
name=
"zip_process_msg"
>
Verarbeite Zip-Datei…
</string>
<string
name=
"manual_boot_image"
>
Bitte Boot-Image auswählen!
</string>
<string
name=
"manual_boot_image"
>
Bitte Boot-Image auswählen!
</string>
...
...
app/src/main/res/values-es/strings.xml
View file @
64da9281
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
<string
name=
"process_error"
>
Error de proceso
</string>
<string
name=
"process_error"
>
Error de proceso
</string>
<string
name=
"internal_storage"
>
El zip es almacenado en:\n[Internal Storage]%1$s
</string>
<string
name=
"internal_storage"
>
El zip es almacenado en:\n[Internal Storage]%1$s
</string>
<string
name=
"zip_download_title"
>
Descargando
</string>
<string
name=
"zip_download_title"
>
Descargando
</string>
<string
name=
"zip_download_msg"
>
Descargando el archivo zip …
</string>
<string
name=
"zip_download_msg"
>
Descargando el archivo zip
(%1$d%%)
…
</string>
<string
name=
"zip_process_title"
>
Procesando
</string>
<string
name=
"zip_process_title"
>
Procesando
</string>
<string
name=
"manual_boot_image"
>
¡Selecciona manualmente una imagen boot!
</string>
<string
name=
"manual_boot_image"
>
¡Selecciona manualmente una imagen boot!
</string>
<string
name=
"manager_update_title"
>
Nueva actualización de Magisk Manager disponible!
</string>
<string
name=
"manager_update_title"
>
Nueva actualización de Magisk Manager disponible!
</string>
...
...
app/src/main/res/values-fr/strings.xml
View file @
64da9281
...
@@ -92,7 +92,7 @@
...
@@ -92,7 +92,7 @@
<string
name=
"zip_process_title"
>
Exécution
</string>
<string
name=
"zip_process_title"
>
Exécution
</string>
<string
name=
"manual_boot_image"
>
Veuillez sélectionner l\'image boot manuellement !
</string>
<string
name=
"manual_boot_image"
>
Veuillez sélectionner l\'image boot manuellement !
</string>
<string
name=
"zip_download_title"
>
Téléchargement
</string>
<string
name=
"zip_download_title"
>
Téléchargement
</string>
<string
name=
"zip_download_msg"
>
Téléchargement du fichier zip...
</string>
<string
name=
"zip_download_msg"
>
Téléchargement du fichier zip
(%1$d%%)
...
</string>
<string
name=
"manager_update_title"
>
Nouvelle mise à jour Magisk Manager disponible !
</string>
<string
name=
"manager_update_title"
>
Nouvelle mise à jour Magisk Manager disponible !
</string>
<string
name=
"manager_download_install"
>
Appuyez pour télécharger et installer
</string>
<string
name=
"manager_download_install"
>
Appuyez pour télécharger et installer
</string>
<string
name=
"magisk_updates"
>
Mises à jour Magisk
</string>
<string
name=
"magisk_updates"
>
Mises à jour Magisk
</string>
...
...
app/src/main/res/values-nl/strings.xml
View file @
64da9281
...
@@ -98,7 +98,7 @@
...
@@ -98,7 +98,7 @@
<string
name=
"process_error"
>
Verwerkingsfout
</string>
<string
name=
"process_error"
>
Verwerkingsfout
</string>
<string
name=
"internal_storage"
>
De zip is opgeslagen in:\n[Interne opslag]%1$s
</string>
<string
name=
"internal_storage"
>
De zip is opgeslagen in:\n[Interne opslag]%1$s
</string>
<string
name=
"zip_download_title"
>
Downloaden
</string>
<string
name=
"zip_download_title"
>
Downloaden
</string>
<string
name=
"zip_download_msg"
>
Zip-bestand downloaden…
</string>
<string
name=
"zip_download_msg"
>
Zip-bestand downloaden
(%1$d%%)
…
</string>
<string
name=
"zip_process_title"
>
Verwerken
</string>
<string
name=
"zip_process_title"
>
Verwerken
</string>
<string
name=
"zip_process_msg"
>
Zip-bestand verwerken…
</string>
<string
name=
"zip_process_msg"
>
Zip-bestand verwerken…
</string>
<string
name=
"manual_boot_image"
>
Gelieve handmatig een boot image te selecteren!
</string>
<string
name=
"manual_boot_image"
>
Gelieve handmatig een boot image te selecteren!
</string>
...
...
app/src/main/res/values-pl/strings.xml
View file @
64da9281
...
@@ -101,7 +101,7 @@
...
@@ -101,7 +101,7 @@
<string
name=
"process_error"
>
Błąd procesu
</string>
<string
name=
"process_error"
>
Błąd procesu
</string>
<string
name=
"internal_storage"
>
Zip jest przechowywany w:\n[Pamięć Wewnętrzna]%1$s
</string>
<string
name=
"internal_storage"
>
Zip jest przechowywany w:\n[Pamięć Wewnętrzna]%1$s
</string>
<string
name=
"zip_download_title"
>
Pobieranie
</string>
<string
name=
"zip_download_title"
>
Pobieranie
</string>
<string
name=
"zip_download_msg"
>
Pobieranie pliku zip …
</string>
<string
name=
"zip_download_msg"
>
Pobieranie pliku zip
(%1$d%%)
…
</string>
<string
name=
"zip_process_title"
>
Przetwarzanie
</string>
<string
name=
"zip_process_title"
>
Przetwarzanie
</string>
<string
name=
"zip_process_msg"
>
Przetwarzanie pliku zip …
</string>
<string
name=
"zip_process_msg"
>
Przetwarzanie pliku zip …
</string>
<string
name=
"manual_boot_image"
>
Proszę ręcznie wybrać boot image!
</string>
<string
name=
"manual_boot_image"
>
Proszę ręcznie wybrać boot image!
</string>
...
...
app/src/main/res/values-ru/strings.xml
View file @
64da9281
...
@@ -98,7 +98,7 @@
...
@@ -98,7 +98,7 @@
<string
name=
"process_error"
>
Ошибка обработки
</string>
<string
name=
"process_error"
>
Ошибка обработки
</string>
<string
name=
"internal_storage"
>
Архив расположен:\n[Внутреннее Хранилище]%1$s
</string>
<string
name=
"internal_storage"
>
Архив расположен:\n[Внутреннее Хранилище]%1$s
</string>
<string
name=
"zip_download_title"
>
Загрузка
</string>
<string
name=
"zip_download_title"
>
Загрузка
</string>
<string
name=
"zip_download_msg"
>
Загрузка архива…
</string>
<string
name=
"zip_download_msg"
>
Загрузка архива
(%1$d%%)
…
</string>
<string
name=
"zip_process_title"
>
Обработка
</string>
<string
name=
"zip_process_title"
>
Обработка
</string>
<string
name=
"zip_process_msg"
>
Обработка архива…
</string>
<string
name=
"zip_process_msg"
>
Обработка архива…
</string>
<string
name=
"manual_boot_image"
>
Пожалуйста, выберите вручную boot-образ!
</string>
<string
name=
"manual_boot_image"
>
Пожалуйста, выберите вручную boot-образ!
</string>
...
...
app/src/main/res/values-tr/strings.xml
View file @
64da9281
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
<string
name=
"process_error"
>
İşlem hatası
</string>
<string
name=
"process_error"
>
İşlem hatası
</string>
<string
name=
"internal_storage"
>
Zip şuraya depolandı:\n[Dahili Hafıza]%1$s
</string>
<string
name=
"internal_storage"
>
Zip şuraya depolandı:\n[Dahili Hafıza]%1$s
</string>
<string
name=
"zip_download_title"
>
İndiriliyor
</string>
<string
name=
"zip_download_title"
>
İndiriliyor
</string>
<string
name=
"zip_download_msg"
>
Zip dosyası indiriliyor …
</string>
<string
name=
"zip_download_msg"
>
Zip dosyası indiriliyor
(%1$d%%)
…
</string>
<string
name=
"zip_process_title"
>
İşleniyor
</string>
<string
name=
"zip_process_title"
>
İşleniyor
</string>
<string
name=
"zip_process_msg"
>
Zip dosyası işleniyor …
</string>
<string
name=
"zip_process_msg"
>
Zip dosyası işleniyor …
</string>
<string
name=
"manual_boot_image"
>
Lütfen elle bir boot imajı seçin!
</string>
<string
name=
"manual_boot_image"
>
Lütfen elle bir boot imajı seçin!
</string>
...
...
app/src/main/res/values-uk/strings.xml
View file @
64da9281
...
@@ -98,7 +98,7 @@
...
@@ -98,7 +98,7 @@
<string
name=
"repo_cache_cleared"
>
Кеш репозиторію очищено
</string>
<string
name=
"repo_cache_cleared"
>
Кеш репозиторію очищено
</string>
<string
name=
"safetyNet_hide_notice"
>
Ця програма використовує SafetyNet.\nВже опрацьовано MagiskHide за замовчуванням
</string>
<string
name=
"safetyNet_hide_notice"
>
Ця програма використовує SafetyNet.\nВже опрацьовано MagiskHide за замовчуванням
</string>
<string
name=
"zip_download_title"
>
Завантаження
</string>
<string
name=
"zip_download_title"
>
Завантаження
</string>
<string
name=
"zip_download_msg"
>
Завантаження zip файлу …
</string>
<string
name=
"zip_download_msg"
>
Завантаження zip файлу
(%1$d%%)
…
</string>
<string
name=
"process_error"
>
Помилка опрацювання
</string>
<string
name=
"process_error"
>
Помилка опрацювання
</string>
<string
name=
"internal_storage"
>
Архів розташований:\n[Внутрішнє Сховище]%1$s
</string>
<string
name=
"internal_storage"
>
Архів розташований:\n[Внутрішнє Сховище]%1$s
</string>
<string
name=
"zip_process_title"
>
Опрацювання
</string>
<string
name=
"zip_process_title"
>
Опрацювання
</string>
...
...
app/src/main/res/values-zh-rTW/strings.xml
View file @
64da9281
...
@@ -206,7 +206,7 @@
...
@@ -206,7 +206,7 @@
<string
name=
"settings_update"
>
更新設定
</string>
<string
name=
"settings_update"
>
更新設定
</string>
<string
name=
"settings_boot_format_title"
>
已補丁 Boot 映像輸出格式
</string>
<string
name=
"settings_boot_format_title"
>
已補丁 Boot 映像輸出格式
</string>
<string
name=
"zip_download_title"
>
正在下載
</string>
<string
name=
"zip_download_title"
>
正在下載
</string>
<string
name=
"zip_download_msg"
>
正在下載 Zip 文件 …
</string>
<string
name=
"zip_download_msg"
>
正在下載 Zip 文件
(%1$d%%)
…
</string>
<string
name=
"settings_boot_format_summary"
>
選擇已補丁 Boot 映像文件輸出格式\n若要透過 fastboot/download 模式刷入,請選擇 .img 格式;若要透過 ODIN 刷入,則選擇 .img.tar\n
</string>
<string
name=
"settings_boot_format_summary"
>
選擇已補丁 Boot 映像文件輸出格式\n若要透過 fastboot/download 模式刷入,請選擇 .img 格式;若要透過 ODIN 刷入,則選擇 .img.tar\n
</string>
<string
name=
"complete_uninstall"
>
完全解除安裝
</string>
<string
name=
"complete_uninstall"
>
完全解除安裝
</string>
<string
name=
"restore_stock_boot"
>
還原原廠 boot 映像
</string>
<string
name=
"restore_stock_boot"
>
還原原廠 boot 映像
</string>
...
...
app/src/main/res/values/strings.xml
View file @
64da9281
...
@@ -101,7 +101,7 @@
...
@@ -101,7 +101,7 @@
<string
name=
"process_error"
>
Process error
</string>
<string
name=
"process_error"
>
Process error
</string>
<string
name=
"internal_storage"
>
The zip is stored in:\n[Internal Storage]%1$s
</string>
<string
name=
"internal_storage"
>
The zip is stored in:\n[Internal Storage]%1$s
</string>
<string
name=
"zip_download_title"
>
Downloading
</string>
<string
name=
"zip_download_title"
>
Downloading
</string>
<string
name=
"zip_download_msg"
>
Downloading zip file …
</string>
<string
name=
"zip_download_msg"
>
Downloading zip file
(%1$d%%)
…
</string>
<string
name=
"zip_process_title"
>
Processing
</string>
<string
name=
"zip_process_title"
>
Processing
</string>
<string
name=
"zip_process_msg"
>
Processing zip file …
</string>
<string
name=
"zip_process_msg"
>
Processing zip file …
</string>
<string
name=
"manual_boot_image"
>
Please manually select a boot image!
</string>
<string
name=
"manual_boot_image"
>
Please manually select a boot image!
</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment