From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 23 Aug 2016 18:30:27 +0000 (+0200)
Subject: rename server request from "delete" to "uninstall"
X-Git-Tag: 0.7.0~4^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=6126b55136a0e6bdda8602d8b2ba8ee68c590e0e;p=fdroidserver.git

rename server request from "delete" to "uninstall"

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
---

diff --git a/examples/config.py b/examples/config.py
index d33ddfac..43eceb1d 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -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
-# must be installed or deleted on the client (aka "push installs).  If
-# the user has opted in, or the device is already setup to respond to
-# these requests, then fdroidclient will automatically install/delete
+# must be installed or uninstalled on the client (aka "push installs).
+# If the user has opted in, or the device is already setup to respond
+# to these requests, then F-Droid will automatically install/uninstall
 # the packageNames listed.  This is protected by the same signing key
 # as the app index metadata.
 #
@@ -260,7 +260,7 @@ The repository of older versions of applications from the main demo repository.
 #     'us.replicant',
 # }
 #
-# delete_list = {
+# uninstall_list = {
 #     'com.facebook.orca',
 #     'com.android.vending',
 # }
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 6261a69e..b1ebfd35 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -959,7 +959,7 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
     repoel.setAttribute("pubkey", extract_pubkey().decode('utf-8'))
     root.appendChild(repoel)
 
-    for command in ('install', 'delete'):
+    for command in ('install', 'uninstall'):
         packageNames = []
         key = command + '_list'
         if key in config:
diff --git a/tests/run-tests b/tests/run-tests
index 7e0eb2aa..c681a2ba 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -147,13 +147,13 @@ $fdroid init
 cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $REPOROOT/
 echo "accepted_formats = ['json', 'txt', 'xml', 'yml']" >> 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
 test -e repo/index.xml
 test -e repo/index.jar
 grep -F '<application id=' 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
 
 
 #------------------------------------------------------------------------------#