kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-03 17:50:11 +02:00
Code Activity

rename server request from "delete" to "uninstall"

Browse Source 
This matches the Android API's current Intent action for this, rather than
the deprecated one:

https://gitlab.com/fdroid/fdroidclient/blob/v0.101-alpha5/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java#L147
https://developer.android.com/reference/android/content/Intent.html#ACTION_UNINSTALL_PACKAGE
https://developer.android.com/reference/android/content/Intent.html#ACTION_DELETE
This commit is contained in:
Hans-Christoph Steiner 2016-08-23 20:30:27 +02:00
parent a6a8d34528
commit 6126b55136
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/config.py
View File

@ -248,9 +248,9 @@ The repository of older versions of applications from the main demo repository.
# } # }
# It is possible for the server operator to specify lists of apps that # It is possible for the server operator to specify lists of apps that
# must be installed or deleted on the client (aka "push installs). If # must be installed or uninstalled on the client (aka "push installs).
# the user has opted in, or the device is already setup to respond to # If the user has opted in, or the device is already setup to respond
# these requests, then fdroidclient will automatically install/delete # to these requests, then F-Droid will automatically install/uninstall
# the packageNames listed. This is protected by the same signing key # the packageNames listed. This is protected by the same signing key
# as the app index metadata. # as the app index metadata.
# #
@ -260,7 +260,7 @@ The repository of older versions of applications from the main demo repository.
# 'us.replicant', # 'us.replicant',
# } # }
# #
# delete_list = { # uninstall_list = {
# 'com.facebook.orca', # 'com.facebook.orca',
# 'com.android.vending', # 'com.android.vending',
# } # }

2
fdroidserver/update.py
View File

@ -959,7 +959,7 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
repoel.setAttribute("pubkey", extract_pubkey().decode('utf-8')) repoel.setAttribute("pubkey", extract_pubkey().decode('utf-8'))
root.appendChild(repoel) root.appendChild(repoel)
for command in ('install', 'delete'): for command in ('install', 'uninstall'):
packageNames = [] packageNames = []
key = command + '_list' key = command + '_list'
if key in config: if key in config:

4
tests/run-tests
View File

@ -147,13 +147,13 @@ $fdroid init
cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $REPOROOT/ cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $REPOROOT/
echo "accepted_formats = ['json', 'txt', 'xml', 'yml']" >> config.py echo "accepted_formats = ['json', 'txt', 'xml', 'yml']" >> config.py
echo "install_list = 'org.adaway'" >> config.py echo "install_list = 'org.adaway'" >> config.py
echo "delete_list = {'com.android.vending', 'com.facebook.orca',}" >> config.py echo "uninstall_list = {'com.android.vending', 'com.facebook.orca',}" >> config.py
$fdroid update --verbose $fdroid update --verbose
test -e repo/index.xml test -e repo/index.xml
test -e repo/index.jar test -e repo/index.jar
grep -F '<application id=' repo/index.xml > /dev/null grep -F '<application id=' repo/index.xml > /dev/null
grep -F '<install packageName=' repo/index.xml > /dev/null grep -F '<install packageName=' repo/index.xml > /dev/null
grep -F '<delete packageName=' repo/index.xml > /dev/null grep -F '<uninstall packageName=' repo/index.xml > /dev/null
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#