Icons for android app

Makefile

@@ -20,6 +20,7 @@ install:
 	mkdir -p ${DESTDIR}${PREFIX}/bin
 	mkdir -p ${DESTDIR}/usr/share/${APP}/base
 	mkdir -p ${DESTDIR}/usr/share/${APP}/apps
+	mkdir -p ${DESTDIR}/usr/share/${APP}/android-app
 	mkdir -p ${DESTDIR}/usr/share/${APP}/utils
 	mkdir -p ${DESTDIR}/usr/share/${APP}/avatars
 	mkdir -p ${DESTDIR}/etc/${APP}
@@ -46,6 +47,7 @@ install:
 	cp man/*.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	cp man/${APP}-backup-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/backup.1.gz
 	cp man/${APP}-restore-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/restore.1.gz
+	cp img/android-app/*.png ${DESTDIR}/usr/share/${APP}/android-app
 	chown -R root: /usr/share/${APP}
 	chmod -R +r /usr/share/${APP}
 #	bash -c "./translate install"

src/freedombone-app-akaunting

@@ -42,7 +42,6 @@ AKAUNTING_BACKGROUND_IMAGE_URL=
 
 AKAUNTING_SHORT_DESCRIPTION=$'Personal accounting'
 AKAUNTING_DESCRIPTION=$'Personal or small business accounting'
-AKAUNTING_ICON_URL=
 AKAUNTING_MOBILE_APP_URL=
 
 akaunting_variables=(ONION_ONLY

src/freedombone-app-bludit

@@ -37,7 +37,6 @@ BLUDIT_COMMIT='0e27e31a84421b3e6bd000a77bc89c2dff3c446a'
 
 BLUDIT_SHORT_DESCRIPTION=$'Bludit Blog'
 BLUDIT_DESCRIPTION=$'Simple Markdown blogging'
-BLUDIT_ICON_URL=
 BLUDIT_MOBILE_APP_URL=
 
 bludit_variables=(ONION_ONLY

src/freedombone-app-dlna

@@ -33,7 +33,6 @@ SHOW_ON_ABOUT=0
 
 DLNA_SHORT_DESCRIPTION=$'DLNA media'
 DLNA_DESCRIPTION=$'DLNA media'
-DLNA_ICON_URL=
 DLNA_MOBILE_APP_URL=
 
 dlna_variables=(SYSTEM_TYPE

src/freedombone-app-dokuwiki

@@ -42,7 +42,6 @@ DOKUWIKI_COMMIT='be15c01c0b982cf1a75b5af031bf077143c63f39'
 
 DOKUWIKI_SHORT_DESCRIPTION=$'Dokuwiki'
 DOKUWIKI_DESCRIPTION=$'Dokuwiki databaseless wiki'
-DOKUWIKI_ICON_URL=
 DOKUWIKI_MOBILE_APP_URL=
 
 dokuwiki_variables=(ONION_ONLY

src/freedombone-app-edith

@@ -40,7 +40,6 @@ EDITH_LOGIN_TEXT=$"Edith login"
 
 EDITH_SHORT_DESCRIPTION=$'Edith Notes'
 EDITH_DESCRIPTION=$'Extremely simple note taking'
-EDITH_ICON_URL=
 EDITH_MOBILE_APP_URL=
 
 edith_variables=(MY_USERNAME

src/freedombone-app-etherpad

@@ -44,7 +44,6 @@ ETHERPAD_WELCOME_MESSAGE=$"Welcome to ${ETHERPAD_TITLE}!\\n\\nThis pad text is s
 
 ETHERPAD_SHORT_DESCRIPTION=$'Etherpad'
 ETHERPAD_DESCRIPTION=$'Etherpad'
-ETHERPAD_ICON_URL=
 ETHERPAD_MOBILE_APP_URL=
 
 etherpad_variables=(ONION_ONLY

src/freedombone-app-fedwiki

@@ -44,7 +44,6 @@ FEDWIKI_COOKIE=
 
 FEDWIKI_SHORT_DESCRIPTION=$'FedWiki'
 FEDWIKI_DESCRIPTION=$'Federated Wiki'
-FEDWIKI_ICON_URL=
 FEDWIKI_MOBILE_APP_URL=
 
 fedwiki_variables=(FEDWIKI_DOMAIN_NAME

src/freedombone-app-friendica

@@ -42,7 +42,6 @@ FRIENDICA_ADDONS_COMMIT='7cb9dbdda7f227462895c07be3c968405561d40e'
 
 FRIENDICA_SHORT_DESCRIPTION=$'Friendica'
 FRIENDICA_DESCRIPTION=$'Friendica federated social network'
-FRIENDICA_ICON_URL=
 FRIENDICA_MOBILE_APP_URL=
 
 friendica_variables=(ONION_ONLY

src/freedombone-app-gnusocial

@@ -48,7 +48,6 @@ GNUSOCIAL_EXPIRE_MONTHS=3
 
 GNUSOCIAL_SHORT_DESCRIPTION=$'GNU Social'
 GNUSOCIAL_DESCRIPTION=$'GNU Social federated microblogging'
-GNUSOCIAL_ICON_URL=
 GNUSOCIAL_MOBILE_APP_URL='https://f-droid.org/packages/org.mariotaku.twidere/'
 
 gnusocial_variables=(ONION_ONLY

src/freedombone-app-gogs

@@ -43,7 +43,6 @@ GOGS_PORT=3145
 
 GOGS_SHORT_DESCRIPTION=$'Gogs'
 GOGS_DESCRIPTION=$'Gogs git repo management'
-GOGS_ICON_URL=
 GOGS_MOBILE_APP_URL=
 
 gogs_variables=(ONION_ONLY

src/freedombone-app-htmly

@@ -41,7 +41,6 @@ HTMLY_SUBTITLE="Another ${PROJECT_NAME} blog"
 
 HTMLY_SHORT_DESCRIPTION=$'HTMLy'
 HTMLY_DESCRIPTION=$'HTMLy databaseless blogging'
-HTMLY_ICON_URL=
 HTMLY_MOBILE_APP_URL=
 
 htmly_variables=(HTMLY_REPO

src/freedombone-app-hubzilla

@@ -43,7 +43,6 @@ HUBZILLA_ADMIN_PASSWORD=
 
 HUBZILLA_SHORT_DESCRIPTION=$'Hubzilla'
 HUBZILLA_DESCRIPTION=$'Hubzilla'
-HUBZILLA_ICON_URL=
 HUBZILLA_MOBILE_APP_URL=
 
 hubzilla_variables=(ONION_ONLY

src/freedombone-app-icecast

@@ -46,7 +46,6 @@ ICECAST_LOGIN_TEXT=$"Icecast login"
 
 ICECAST_SHORT_DESCRIPTION=$'Icecast'
 ICECAST_DESCRIPTION=$'Icecast'
-ICECAST_ICON_URL=
 ICECAST_MOBILE_APP_URL=
 
 icecast_variables=(MY_USERNAME

src/freedombone-app-irc

@@ -43,7 +43,6 @@ IRC_BUFFER_LENGTH=300
 
 IRC_SHORT_DESCRIPTION=$'IRC'
 IRC_DESCRIPTION=$'IRC'
-IRC_ICON_URL=
 IRC_MOBILE_APP_URL='https://f-droid.org/packages/org.yaaic'
 
 irc_variables=(MY_USERNAME

src/freedombone-app-jitsi

@@ -46,7 +46,6 @@ JITSI_ONION_HOSTNAME=
 
 JITSI_SHORT_DESCRIPTION=$'Jitsi'
 JITSI_DESCRIPTION=$'Jitsi'
-JITSI_ICON_URL=
 JITSI_MOBILE_APP_URL=
 
 jitsi_variables=(ONION_ONLY

src/freedombone-app-kanboard

@@ -40,7 +40,6 @@ KANBOARD_ADMIN_PASSWORD=
 
 KANBOARD_SHORT_DESCRIPTION=$'Kanboard'
 KANBOARD_DESCRIPTION=$'Kanboard kanban'
-KANBOARD_ICON_URL=
 KANBOARD_MOBILE_APP_URL=
 
 kanboard_variables=(ONION_ONLY

src/freedombone-app-koel

@@ -42,7 +42,6 @@ KOEL_ADMIN_PASSWORD=
 
 KOEL_SHORT_DESCRIPTION=$'Koel music'
 KOEL_DESCRIPTION=$'Koel music player'
-KOEL_ICON_URL=
 KOEL_MOBILE_APP_URL=
 
 koel_variables=(ONION_ONLY

src/freedombone-app-lychee

@@ -39,7 +39,6 @@ LYCHEE_COMMIT='27f207dcbac8488629ffc3b5a9cac78ae123bee9'
 
 LYCHEE_SHORT_DESCRIPTION=$'Lychee photos'
 LYCHEE_DESCRIPTION=$'Lychee photos'
-LYCHEE_ICON_URL=
 LYCHEE_MOBILE_APP_URL=
 
 lychee_variables=(LYCHEE_REPO

src/freedombone-app-mailpile

@@ -40,7 +40,6 @@ MAILPILE_PORT=33411
 
 MAILPILE_SHORT_DESCRIPTION=$'Mailpile'
 MAILPILE_DESCRIPTION=$'Mailpile email client'
-MAILPILE_ICON_URL=
 MAILPILE_MOBILE_APP_URL=
 
 mailpile_variables=(MAILPILE_REPO

src/freedombone-app-matrix

@@ -55,7 +55,6 @@ MATRIX_EXPIRE_MONTHS=1
 
 MATRIX_SHORT_DESCRIPTION=$'Matrix chat'
 MATRIX_DESCRIPTION=$'Matrix chat'
-MATRIX_ICON_URL=
 MATRIX_MOBILE_APP_URL='https://f-droid.org/packages/im.vector.alpha'
 
 matrix_variables=(ONION_ONLY

src/freedombone-app-mediagoblin

@@ -35,14 +35,13 @@ MEDIAGOBLIN_DOMAIN_NAME=
 MEDIAGOBLIN_ADMIN_PASSWORD=
 MEDIAGOBLIN_CODE=
 MEDIAGOBLIN_ONION_PORT=8108
-MEDIAGOBLIN_REPO="http://git.savannah.gnu.org/r/mediagoblin.git"
+MEDIAGOBLIN_REPO="https://git.savannah.gnu.org/git/mediagoblin.git"
 MEDIAGOBLIN_COMMIT='c4d3293dfa4076719e60fe9e052add07426f9a9a'
 MEDIAGOBLIN_BASE_DIR=/var/www/mediagoblin.local/htdocs
 MEDIAGOBLIN_PORT=6543
 
 MEDIAGOBLIN_SHORT_DESCRIPTION=$'Mediagoblin'
 MEDIAGOBLIN_DESCRIPTION=$'Mediagoblin'
-MEDIAGOBLIN_ICON_URL=
 MEDIAGOBLIN_MOBILE_APP_URL=
 
 mediagoblin_variables=(ONION_ONLY

src/freedombone-app-movim

@@ -41,7 +41,6 @@ MOVIM_DAEMON_PORT=8880
 
 MOVIM_SHORT_DESCRIPTION=$'Movim'
 MOVIM_DESCRIPTION=$'Movim'
-MOVIM_ICON_URL=
 MOVIM_MOBILE_APP_URL='https://f-droid.org/packages/com.movim.movim'
 
 movim_variables=(ONION_ONLY

src/freedombone-app-mumble

@@ -42,7 +42,6 @@ MUMBLE_CONFIG_FILE="mumble-server.ini"
 
 MUMBLE_SHORT_DESCRIPTION=$'Mumble'
 MUMBLE_DESCRIPTION=$'Mumble'
-MUMBLE_ICON_URL=
 MUMBLE_MOBILE_APP_URL='https://f-droid.org/packages/com.morlunk.mumbleclient'
 
 mumble_variables=(MY_USERNAME

src/freedombone-app-nextcloud

@@ -44,7 +44,6 @@ NEXTCLOUD_SERVER_SIDE_ENCRYPTION=1
 
 NEXTCLOUD_SHORT_DESCRIPTION=$'NextCloud'
 NEXTCLOUD_DESCRIPTION=$'NextCloud'
-NEXTCLOUD_ICON_URL=
 NEXTCLOUD_MOBILE_APP_URL='https://f-droid.org/packages/com.nextcloud.client'
 
 nextcloud_variables=(ONION_ONLY

src/freedombone-app-peertube

@@ -46,7 +46,6 @@ PEERTUBE_DIR=/etc/peertube
 
 PEERTUBE_SHORT_DESCRIPTION=$'PeerTube'
 PEERTUBE_DESCRIPTION=$'PeerTube'
-PEERTUBE_ICON_URL=
 PEERTUBE_MOBILE_APP_URL=
 
 peertube_variables=(PEERTUBE_DOMAIN_NAME

src/freedombone-app-pleroma

@@ -53,7 +53,6 @@ blocking_script_file=/usr/bin/pleroma-blocking
 
 PLEROMA_SHORT_DESCRIPTION=$'Pleroma'
 PLEROMA_DESCRIPTION=$'Pleroma federated microblogging'
-PLEROMA_ICON_URL=
 PLEROMA_MOBILE_APP_URL='https://f-droid.org/packages/com.keylesspalace.tusky'
 
 pleroma_variables=(ONION_ONLY

src/freedombone-app-postactiv

@@ -47,7 +47,6 @@ POSTACTIV_EXPIRE_MONTHS=3
 
 POSTACTIV_SHORT_DESCRIPTION=$'PostActiv'
 POSTACTIV_DESCRIPTION=$'PostActiv federated microblogging'
-POSTACTIV_ICON_URL=
 POSTACTIV_MOBILE_APP_URL='https://f-droid.org/packages/org.mariotaku.twidere/'
 
 postactiv_variables=(ONION_ONLY

src/freedombone-app-privatebin

@@ -40,7 +40,6 @@ PRIVATEBIN_ADMIN_PASSWORD=
 
 PRIVATEBIN_SHORT_DESCRIPTION=$'PrivateBin'
 PRIVATEBIN_DESCRIPTION=$'PrivateBin zero knowledge pastebin'
-PRIVATEBIN_ICON_URL=
 PRIVATEBIN_MOBILE_APP_URL=
 
 privatebin_variables=(ONION_ONLY

src/freedombone-app-rocketchat

@@ -38,7 +38,6 @@ ROCKETCHAT_PORT_INTERNAL=3000
 
 ROCKETCHAT_SHORT_DESCRIPTION=$'Rocketchat'
 ROCKETCHAT_DESCRIPTION=$'Rocketchat'
-ROCKETCHAT_ICON_URL=
 ROCKETCHAT_MOBILE_APP_URL=
 
 rocketchat_variables=(ONION_ONLY

src/freedombone-app-syncthing

@@ -42,7 +42,6 @@ SYNCTHING_USER_IDS_FILE='.syncthingids'
 
 SYNCTHING_SHORT_DESCRIPTION=$'Syncthing'
 SYNCTHING_DESCRIPTION=$'Syncthing file synchronization'
-SYNCTHING_ICON_URL=
 SYNCTHING_MOBILE_APP_URL='https://f-droid.org/packages/com.nutomic.syncthingandroid'
 
 syncthing_variables=(SYNCTHING_ID

src/freedombone-app-turtl

@@ -50,7 +50,6 @@ turtl_users_file=$TURTL_BASE_DIR/api/controllers/users.lisp
 
 TURTL_SHORT_DESCRIPTION=$'Turtl'
 TURTL_DESCRIPTION=$'Turtl notes'
-TURTL_ICON_URL=
 TURTL_MOBILE_APP_URL=
 
 turtl_variables=(ONION_ONLY

src/freedombone-app-xmpp

@@ -55,7 +55,6 @@ xmpp_encryption_warning=$"For security reasons, OMEMO or PGP encryption is requi
 
 XMPP_SHORT_DESCRIPTION=$'XMPP chat'
 XMPP_DESCRIPTION=$'XMPP chat'
-XMPP_ICON_URL=
 XMPP_MOBILE_APP_URL='https://f-droid.org/packages/eu.siacs.conversations'
 
 xmpp_variables=(ONION_ONLY

src/freedombone-syncthing

@@ -57,7 +57,6 @@ TEMP_IDS_FILE=/root/.synthingids
 
 SYNCTHING_SHORT_DESCRIPTION=$'File Synchronization'
 SYNCTHING_DESCRIPTION=$'File Synchronization'
-SYNCTHING_ICON_URL=
 SYNCTHING_MOBILE_APP_URL='https://f-droid.org/packages/com.nutomic.syncthingandroid'
 
 function remove_user_syncthing {

src/freedombone-template

@@ -283,7 +283,6 @@ echo ''
 echo $'# These parameters are used by the FreedomBox mobile app'
 echo "${app_name_upper}_SHORT_DESCRIPTION="
 echo "${app_name_upper}_DESCRIPTION="
-echo "${app_name_upper}_ICON_URL="
 echo "${app_name_upper}_MOBILE_APP_URL="
 echo ''
 echo "${app_name}_variables=(ONION_ONLY"

src/freedombone-utils-android

@@ -37,6 +37,9 @@ function android_update_apps {
     if [ ! -d "/var/www/${local_hostname}/htdocs/plinth/api" ]; then
         mkdir -p "/var/www/${local_hostname}/htdocs/plinth/api"
     fi
+    if [ ! -d "/var/www/${local_hostname}/htdocs/icons" ]; then
+        mkdir -p "/var/www/${local_hostname}/htdocs/icons"
+    fi
 
     echo '{' > "$plinth_api"
     echo '  "shortcuts": [' >> "$plinth_api"
@@ -50,10 +53,17 @@ function android_update_apps {
             app_name=${APPS_INSTALLED_NAMES[$app_index]}
             app_filename="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"
             if [ -f "$app_filename" ]; then
+                # get the icon for the app
+                icon_filename="/usr/share/${PROJECT_NAME}/android-app/${app_name}.png"
+                if [ -f "$icon_filename" ]; then
+                    cp "$icon_filename" "/var/www/${local_hostname}/htdocs/icons/${app_name}.png"
+                else
+                    icon_filename=
+                fi
+
                 app_name_upper=$(echo "$app_name" | awk '{print toupper($0)}')
                 SHORT_DESCRIPTION=
                 DESCRIPTION=
-                ICON_URL=
                 MOBILE_APP_URL=
 
                 if ! grep -q "${app_name_upper}_SHORT_DESCRIPTION=" "$app_filename"; then
@@ -67,9 +77,6 @@ function android_update_apps {
                 if grep -q "${app_name_upper}_DESCRIPTION=" "$app_filename"; then
                     DESCRIPTION="$(grep "${app_name_upper}_DESCRIPTION=" "$app_filename" | head -n 1 | sed 's|\$||g' | sed "s|'||g" | sed 's|\"||g' | awk -F '=' '{print $2}')"
                 fi
-                if grep -q "${app_name_upper}_ICON_URL=" "$app_filename"; then
-                    ICON_URL="$(grep "${app_name_upper}_ICON_URL=" "$app_filename" | head -n 1 | sed 's|\$||g' | sed 's|\$||g' | sed "s|'||g" | sed 's|\"||g' | awk -F '=' '{print $2}')"
-                fi
                 if grep -q "${app_name_upper}_MOBILE_APP_URL=" "$app_filename"; then
                     MOBILE_APP_URL="$(grep "${app_name_upper}_MOBILE_APP_URL=" "$app_filename" | head -n 1 | sed 's|\$||g' | sed 's|\$||g' | sed "s|'||g" | sed 's|\"||g' | awk -F '=' '{print $2}')"
                 fi
@@ -82,7 +89,7 @@ function android_update_apps {
                   echo "      \"name\": \"${app_name}\",";
                   echo "      \"short_description\": \"$SHORT_DESCRIPTION\",";
                   echo "      \"description\": \"$DESCRIPTION\",";
-                  echo "      \"icon_url\": \"$ICON_URL\",";
+                  echo "      \"icon_url\": \"/icons/${app_name}.png\",";
                   echo "      \"clients\": ["; } >> "$plinth_api"
 
                 read_config_param "${app_name_upper}_DOMAIN_NAME"
@@ -143,6 +150,7 @@ function android_update_apps {
       echo '}'; } >> "$plinth_api"
 
     chown -R www-data:www-data "/var/www/${local_hostname}/htdocs/plinth"
+    chown -R www-data:www-data "/var/www/${local_hostname}/htdocs/icons"
 }
 
 # NOTE: deliberately no exit 0