Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
9 changes: 4 additions & 5 deletions android/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -115,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
CLASSPATH="\\\"\\\""


# Determine the Java command to use to start the JVM.
Expand Down Expand Up @@ -206,15 +205,15 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"

# Stop when "xargs" is not available.
Expand Down
4 changes: 2 additions & 2 deletions android/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ goto fail
:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
set CLASSPATH=


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

:end
@rem End local scope for the variables with windows NT shell
Expand Down
244 changes: 122 additions & 122 deletions src/pages/app/p/[package].bundle.[bundle].vue
Original file line number Diff line number Diff line change
Expand Up @@ -673,132 +673,132 @@ async function deleteBundle() {
class="flex flex-col overflow-hidden overflow-y-auto bg-white border border-slate-300 shadow-lg md:rounded-lg dark:border-slate-900 dark:bg-slate-800"
>
<dl class="divide-y dark:divide-slate-500 divide-slate-200">
<InfoRow :label="t('bundle-number')">
{{ version.name }}
</InfoRow>
<InfoRow :label="t('id')">
{{ version.id.toString() }}
</InfoRow>
<InfoRow v-if="version.created_at" :label="t('created-at')">
{{ formatDate(version.created_at) }}
</InfoRow>
<InfoRow v-if="version.updated_at" :label="t('updated-at')">
{{ formatDate(version.updated_at) }}
</InfoRow>
<!-- Checksum -->
<InfoRow
v-if="version.checksum" :label="t('checksum')" :is-link="true"
@click="copyToast(version?.checksum ?? '')"
>
{{ hideString(version.checksum) }}
</InfoRow>
<!-- Min update version -->
<InfoRow
v-if="showBundleMetadataInput" id="metadata-bundle"
:label="t('min-update-version')" editable
:readonly="organizationStore.hasPermisisonsInRole(role, ['admin', 'super_admin', 'write']) === false"
@click="guardMinAutoUpdate" @update:value="(saveCustomId as any)" @keydown="preventInputChangePerm"
>
{{ version.min_update_version }}
</InfoRow>

<InfoRow v-if="channels && channels.length > 0 && version && channels.filter(c => c.version === version!.id).length > 0" :label="t('channel')">
<div class="flex flex-wrap justify-end w-full gap-3">
<div v-for="chn in channels.filter(c => c.version === version!.id)" id="open-channel" :key="chn.id" class="flex items-center gap-2">
<span
class="font-bold text-blue-600 underline cursor-pointer underline-offset-4 hover:text-blue-700 dark:text-blue-500 dark:hover:text-blue-400"
@click="openChannel(chn)"
>
{{ chn!.name }}
</span>
<InfoRow :label="t('bundle-number')">
{{ version.name }}
</InfoRow>
<InfoRow :label="t('id')">
{{ version.id.toString() }}
</InfoRow>
<InfoRow v-if="version.created_at" :label="t('created-at')">
{{ formatDate(version.created_at) }}
</InfoRow>
<InfoRow v-if="version.updated_at" :label="t('updated-at')">
{{ formatDate(version.updated_at) }}
</InfoRow>
<!-- Checksum -->
<InfoRow
v-if="version.checksum" :label="t('checksum')" :is-link="true"
@click="copyToast(version?.checksum ?? '')"
>
{{ hideString(version.checksum) }}
</InfoRow>
<!-- Min update version -->
<InfoRow
v-if="showBundleMetadataInput" id="metadata-bundle"
:label="t('min-update-version')" editable
:readonly="organizationStore.hasPermisisonsInRole(role, ['admin', 'super_admin', 'write']) === false"
@click="guardMinAutoUpdate" @update:value="(saveCustomId as any)" @keydown="preventInputChangePerm"
>
{{ version.min_update_version }}
</InfoRow>

<InfoRow v-if="channels && channels.length > 0 && version && channels.filter(c => c.version === version!.id).length > 0" :label="t('channel')">
<div class="flex flex-wrap justify-end w-full gap-3">
<div v-for="chn in channels.filter(c => c.version === version!.id)" id="open-channel" :key="chn.id" class="flex items-center gap-2">
<span
class="font-bold text-blue-600 underline cursor-pointer underline-offset-4 hover:text-blue-700 dark:text-blue-500 dark:hover:text-blue-400"
@click="openChannel(chn)"
>
{{ chn!.name }}
</span>
<button
class="p-1 rounded-md border border-gray-200 hover:border-gray-300 hover:bg-gray-50 dark:border-gray-700 dark:hover:border-gray-600 dark:hover:bg-gray-800 transition-colors"
@click="openChannelSettings(chn)"
>
<Settings class="w-4 h-4 text-gray-500 hover:text-blue-500 dark:text-gray-400 dark:hover:text-blue-400" />
</button>
</div>
</div>
</InfoRow>
<InfoRow
v-else id="open-channel" :label="t('channel')" :is-link="true"
@click="ASChannelChooser()"
>
{{ t('set-bundle') }}
</InfoRow>
<InfoRow
v-if="version.session_key" :label="t('encryption')"
>
{{ t('encrypted') }}
</InfoRow>
<InfoRow
v-else :label="t('encryption')"
>
{{ t('not-encrypted-bundle') }}
</InfoRow>
<!-- session_key -->
<InfoRow
v-if="version.session_key" :label="t('session_key')" :is-link="true"
@click="copyToast(version?.session_key ?? '')"
>
{{ hideString(version.session_key) }}
</InfoRow>
<!-- version.external_url -->
<InfoRow
v-if="version.external_url" :label="t('url')" :is-link="true"
@click="copyToast(version?.external_url ?? '')"
>
{{ version.external_url }}
</InfoRow>
<!-- Bundle Link -->
<InfoRow
v-if="version.link" :label="t('bundle-link')" :is-link="true"
@click="openLink(version.link)"
>
{{ version.link }}
</InfoRow>
<!-- Bundle Comment -->
<InfoRow
v-if="version.comment" :label="t('bundle-comment')"
>
{{ version.comment }}
</InfoRow>
<!-- size -->
<InfoRow v-if="version?.r2_path" :label="t('size')" :is-link="true" @click="openDownload()">
{{ showSize }}
</InfoRow>
<InfoRow v-if="!version?.r2_path" :label="t('size')" :is-link="true" @click="openDownload()">
{{ t('cannot-calculate-size-of-partial-bundle') }}
</InfoRow>
<InfoRow v-if="version?.manifest" :label="t('partial-bundle')" :is-link="false">
{{ t('enabled') }}
</InfoRow>
<InfoRow v-if="version?.r2_path" :label="t('zip-bundle')" :is-link="false">
{{ t('enabled') }}
</InfoRow>

<!-- Delete Bundle Action -->
<InfoRow
v-if="!version.deleted"
:label="t('status')"
:icon="IconTrash"
:disabled="!organizationStore.hasPermisisonsInRole(role, ['admin', 'write', 'super_admin'])"
>
<span class="">
{{ t('bundle-active') }}
<button
class="p-1 rounded-md border border-gray-200 hover:border-gray-300 hover:bg-gray-50 dark:border-gray-700 dark:hover:border-gray-600 dark:hover:bg-gray-800 transition-colors"
@click="openChannelSettings(chn)"
@click="deleteBundle"
>
<Settings class="w-4 h-4 text-gray-500 hover:text-blue-500 dark:text-gray-400 dark:hover:text-blue-400" />
<IconTrash class="w-4 h-4 text-red-500 dark:text-red-400 cursor-pointer hover:text-red-600 transition-colors" />
</button>
</div>
</div>
</InfoRow>
<InfoRow
v-else id="open-channel" :label="t('channel')" :is-link="true"
@click="ASChannelChooser()"
>
{{ t('set-bundle') }}
</InfoRow>
<InfoRow
v-if="version.session_key" :label="t('encryption')"
>
{{ t('encrypted') }}
</InfoRow>
<InfoRow
v-else :label="t('encryption')"
>
{{ t('not-encrypted-bundle') }}
</InfoRow>
<!-- session_key -->
<InfoRow
v-if="version.session_key" :label="t('session_key')" :is-link="true"
@click="copyToast(version?.session_key ?? '')"
>
{{ hideString(version.session_key) }}
</InfoRow>
<!-- version.external_url -->
<InfoRow
v-if="version.external_url" :label="t('url')" :is-link="true"
@click="copyToast(version?.external_url ?? '')"
>
{{ version.external_url }}
</InfoRow>
<!-- Bundle Link -->
<InfoRow
v-if="version.link" :label="t('bundle-link')" :is-link="true"
@click="openLink(version.link)"
>
{{ version.link }}
</InfoRow>
<!-- Bundle Comment -->
<InfoRow
v-if="version.comment" :label="t('bundle-comment')"
>
{{ version.comment }}
</InfoRow>
<!-- size -->
<InfoRow v-if="version?.r2_path" :label="t('size')" :is-link="true" @click="openDownload()">
{{ showSize }}
</InfoRow>
<InfoRow v-if="!version?.r2_path" :label="t('size')" :is-link="true" @click="openDownload()">
{{ t('cannot-calculate-size-of-partial-bundle') }}
</InfoRow>
<InfoRow v-if="version?.manifest" :label="t('partial-bundle')" :is-link="false">
{{ t('enabled') }}
</InfoRow>
<InfoRow v-if="version?.r2_path" :label="t('zip-bundle')" :is-link="false">
{{ t('enabled') }}
</InfoRow>

<!-- Delete Bundle Action -->
<InfoRow
v-if="!version.deleted"
:label="t('status')"
:icon="IconTrash"
:disabled="!organizationStore.hasPermisisonsInRole(role, ['admin', 'write', 'super_admin'])"
>
<span class="">
{{ t('bundle-active') }}
<button
class="p-1 rounded-md border border-gray-200 hover:border-gray-300 hover:bg-gray-50 dark:border-gray-700 dark:hover:border-gray-600 dark:hover:bg-gray-800 transition-colors"
@click="deleteBundle"
>
<IconTrash class="w-4 h-4 text-red-500 dark:text-red-400 cursor-pointer hover:text-red-600 transition-colors" />
</button>
</span>
</InfoRow>

<!-- Show deleted status if applicable -->
<InfoRow v-if="version.deleted" :label="t('status')">
{{ t('bundle-deleted') }}
</InfoRow>
</span>
</InfoRow>

<!-- Show deleted status if applicable -->
<InfoRow v-if="version.deleted" :label="t('status')">
{{ t('bundle-deleted') }}
</InfoRow>
</dl>
</div>
</div>
Expand Down
Loading
Loading