Archives/NanoDroid
2
0
Fork 0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-10-31 09:20:23 +00:00
Code Issues Projects Releases Wiki Activity

follow OpenGApps and use API 21 Calender Sync for API 21+, API 19 Calendar Sync for API 19

Browse Source
This commit is contained in:
Christopher Roy Bratusek 2020-01-02 14:24:10 +01:00
parent abb264833e
commit 204e44429e
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CommonInstaller
View File

@ -1332,7 +1332,7 @@ nanodroid_install_apk () {
unset prefix unset prefix
unset source unset source
for sdir in system/app system/priv-app gsync/common/app \ for sdir in system/app system/priv-app \
gsync/${GSYNC_VER}/app gsync/${GSYNC_VER}/priv-app; do gsync/${GSYNC_VER}/app gsync/${GSYNC_VER}/priv-app; do
if [ -f "${INSTALLER}/${sdir}/${app}/${app}.apk.gz" ]; then if [ -f "${INSTALLER}/${sdir}/${app}/${app}.apk.gz" ]; then
source="${INSTALLER}/${sdir}/${app}/${app}.apk" source="${INSTALLER}/${sdir}/${app}/${app}.apk"

7
data/build-package.database
View File

@ -150,17 +150,22 @@ file_database=(
${appsfolder[4]}/GsfProxy/GsfProxy.apk.gz ${appsfolder[4]}/GsfProxy/GsfProxy.apk.gz
${appsfolder[4]}/Phonesky/Phonesky.apk.gz ${appsfolder[4]}/Phonesky/Phonesky.apk.gz
${appsfolder[5]}/common/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz ${appsfolder[5]}/K/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
${appsfolder[5]}/K/app/GoogleContactsSync/GoogleContactsSync.apk.gz ${appsfolder[5]}/K/app/GoogleContactsSync/GoogleContactsSync.apk.gz
${appsfolder[5]}/K/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz ${appsfolder[5]}/K/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
${appsfolder[5]}/L/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
${appsfolder[5]}/L/app/GoogleContactsSync/GoogleContactsSync.apk.gz ${appsfolder[5]}/L/app/GoogleContactsSync/GoogleContactsSync.apk.gz
${appsfolder[5]}/L/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz ${appsfolder[5]}/L/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
${appsfolder[5]}/M/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
${appsfolder[5]}/M/app/GoogleContactsSync/GoogleContactsSync.apk.gz ${appsfolder[5]}/M/app/GoogleContactsSync/GoogleContactsSync.apk.gz
${appsfolder[5]}/M/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz ${appsfolder[5]}/M/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
${appsfolder[5]}/N/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
${appsfolder[5]}/N/app/GoogleContactsSync/GoogleContactsSync.apk.gz ${appsfolder[5]}/N/app/GoogleContactsSync/GoogleContactsSync.apk.gz
${appsfolder[5]}/N/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz ${appsfolder[5]}/N/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
${appsfolder[5]}/O/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
${appsfolder[5]}/O/app/GoogleContactsSync/GoogleContactsSync.apk.gz ${appsfolder[5]}/O/app/GoogleContactsSync/GoogleContactsSync.apk.gz
${appsfolder[5]}/O/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz ${appsfolder[5]}/O/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
${appsfolder[5]}/P/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
${appsfolder[5]}/P/app/GoogleContactsSync/GoogleContactsSync.apk.gz ${appsfolder[5]}/P/app/GoogleContactsSync/GoogleContactsSync.apk.gz
${appsfolder[5]}/P/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz ${appsfolder[5]}/P/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz

18
data/build-package.download
View File

@ -266,12 +266,24 @@ grab_apk_from_gitlab () {
grab_apk_from_ogapps () { grab_apk_from_ogapps () {
case "${1}" in case "${1}" in
"com.google.android.syncadapters.calendar" ) "com.google.android.syncadapters.calendar" )
local apk_url="https://gitlab.opengapps.org/opengapps/all/raw/master/${2}/${1}/15/nodpi/2015080710.apk" case "${4}" in
local api_letter=common 19 ) local api_letter=K ;;
21 ) local api_letter=L ;;
23 ) local api_letter=M ;;
24 ) local api_letter=N ;;
26 ) local api_letter=O ;;
28 ) local api_letter=P ;;
esac
if [ "${4}" -eq 19 ]; then
local apk_url="https://gitlab.opengapps.org/opengapps/all/raw/master/${2}/${1}/15/nodpi/2015080710.apk"
else
local apk_url="https://gitlab.opengapps.org/opengapps/all/raw/master/${2}/${1}/21/nodpi/2016184095.apk"
fi
;; ;;
* ) * )
apk_url="https://gitlab.opengapps.org/opengapps/all/raw/master/${2}/${1}/${4}/nodpi/${4}.apk" local apk_url="https://gitlab.opengapps.org/opengapps/all/raw/master/${2}/${1}/${4}/nodpi/${4}.apk"
case "${4}" in case "${4}" in
19 ) local api_letter=K ;; 19 ) local api_letter=K ;;
21 ) local api_letter=L ;; 21 ) local api_letter=L ;;

3
data/build-package.update
View File

@ -78,11 +78,10 @@ update_microg () {
grab_gsync () { grab_gsync () {
# KK LL M N O P # KK LL M N O P
for API in 19 21 23 24 26 28; do for API in 19 21 23 24 26 28; do
grab_apk_from_ogapps ${og_CALSYNC[@]} ${API}
grab_apk_from_ogapps ${og_CONSYNC[@]} ${API} grab_apk_from_ogapps ${og_CONSYNC[@]} ${API}
grab_apk_from_ogapps ${og_BTRANSP[@]} ${API} grab_apk_from_ogapps ${og_BTRANSP[@]} ${API}
done done
grab_apk_from_ogapps ${og_CALSYNC[@]}
} }
update_gsync () { update_gsync () {