Skip to content

Commit e6a4516

Browse files
committed
V1.4.5
1 parent 3e326e5 commit e6a4516

5 files changed

Lines changed: 25 additions & 2 deletions

File tree

.github/workflows/generator-android.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,8 @@ jobs:
351351
sed -i -e 's|"Copyright 2025 Purslane Ltd. All rights reserved."|"Copyright 2025"|' ./flutter/windows/runner/Runner.rc
352352
sed -i -e 's|"rustdesk.exe"|"${{ inputs.filename }}"|' ./flutter/windows/runner/Runner.rc
353353
sed -i -e 's|"RustDesk"|"${{ inputs.appname }}"|' ./flutter/windows/runner/Runner.rc
354+
# change powered by rustdek to powered by compname
355+
sed -i -e 's|Powered by RustDesk|Powered by ${{ inputs.compname }}|' ./flutter/android/app/src/main/res/values/strings.xml
354356
find ./src/lang -name "*.rs" -exec sed -i -e 's|RustDesk|${{ inputs.appname }}|' {} \;
355357
find ./src/lang -name "*.rs" -exec sed -i -e 's|("Slogan_tip",.*)|("Slogan_tip", "${{ fromJson(inputs.extras).slogan }}")|' {} \;
356358
sed -i -e 's|RustDesk|${{ inputs.appname }}|' ./flutter/android/app/src/main/res/values/strings.xml
@@ -379,6 +381,15 @@ jobs:
379381
sed -i -e "s|launchUrlString('https://rustdesk.com/privacy.html')|launchUrlString('${{ fromJson(inputs.extras).urlLink }}/privacy.html')|" ./flutter/lib/mobile/pages/settings_page.dart
380382
sed -i -e "s|https://rustdesk.com/privacy.html|${{ fromJson(inputs.extras).urlLink }}/privacy.html|" ./flutter/lib/mobile/pages/settings_page.dart
381383
384+
- name: change app id to custom
385+
if: fromJson(inputs.extras).androidappid != 'com.carriez.flutter_hbb'
386+
continue-on-error: true
387+
shell: bash
388+
run: |
389+
sed -i -e 's|com.carriez.flutter_hbb|fromJson(inputs.extras).androidappid|' ./flutter/android/app/build.gradle
390+
391+
392+
382393
- name: change download link to custom
383394
if: fromJson(inputs.extras).downloadLink != 'https://rustdesk.com/download'
384395
continue-on-error: true

rdgenerator/forms.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class GenerateForm(forms.Form):
1212
('macos-x86','macOS (x86)')
1313
], initial='macos')
1414
version = forms.ChoiceField(
15-
choices=[('master','nightly'),('1.4.4','1.4.4'),('1.4.3','1.4.3'),('1.4.2','1.4.2'),('1.4.1','1.4.1'),('1.4.0','1.4.0'),('1.3.9','1.3.9'),('1.3.8','1.3.8'),('1.3.7','1.3.7'),('1.3.6','1.3.6'),('1.3.5','1.3.5'),('1.3.4','1.3.4'),('1.3.3','1.3.3')],
15+
choices=[('master','nightly'),('1.4.5','1.4.5'),('1.4.4','1.4.4'),('1.4.3','1.4.3'),('1.4.2','1.4.2'),('1.4.1','1.4.1'),('1.4.0','1.4.0'),('1.3.9','1.3.9'),('1.3.8','1.3.8'),('1.3.7','1.3.7'),('1.3.6','1.3.6'),('1.3.5','1.3.5'),('1.3.4','1.3.4'),('1.3.3','1.3.3')],
1616
initial='1.4.3',
1717
help_text=mark_safe("If a build fails, let me know. Start a issue on GitHub: <a href='https://github.com/VenimK/creator/issues' style='color: #007bff; font-weight: bold; text-decoration: underline;'>Click here to report an issue</a>")
1818
)
@@ -36,6 +36,7 @@ class GenerateForm(forms.Form):
3636
('settingsN', 'Disable ALL settings (complete lockdown)'),
3737
('settingsGranular', 'Hide specific settings (granular control)')
3838
], initial='settingsY')
39+
androidappid = forms.CharField(label="Custom Android App ID (replaces 'com.carriez.flutter_hbb')", required=False)
3940

4041
# Granular hide settings options - Tabs
4142
hideGeneralSettings = forms.BooleanField(label="Hide General Settings", initial=False, required=False, help_text="Hide general settings tab (theme, language, etc.)")

rdgenerator/templates/generator.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,9 @@ <h2><i class="fas fa-sliders-h"></i> General</h2>
318318
<label for="{{ form.settings.id_for_label }}">Settings Control:</label>
319319
{{ form.settings }}<br><br>
320320

321+
<label for="{{ form.androidappid.id_for_label }}">Custom Android App ID (replaces 'com.carriez.flutter_hbb'):</label>
322+
{{ form.androidappid }}<br><br>
323+
321324
<!-- Granular Settings Options (hidden by default) -->
322325
<div id="granular-settings" style="display: none; margin-left: 20px; padding: 15px; background: rgba(255,255,255,0.1); border-radius: 8px; margin-top: 10px;">
323326
<h4 style="color: #e94560; margin-top: 0;"><i class="fas fa-cogs"></i> Granular Settings Control</h4>

rdgenerator/views.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
from .models import GithubRun
1616
from PIL import Image
1717
from urllib.parse import quote
18+
from cryptography.hazmat.primitives import hashes, serialization
19+
from cryptography.hazmat.primitives.asymmetric import padding
1820

1921
def generator_view(request):
2022
if request.method == 'POST':
@@ -61,6 +63,9 @@ def generator_view(request):
6163
compname = form.cleaned_data['compname']
6264
if not compname:
6365
compname = "Purslane Ltd"
66+
androidappid = form.cleaned_data['androidappid']
67+
if not androidappid:
68+
androidappid = "com.carriez.flutter_hbb"
6469
compname = compname.replace("&","\\&")
6570
permPass = form.cleaned_data['permanentPassword']
6671
theme = form.cleaned_data['theme']
@@ -235,6 +240,7 @@ def generator_view(request):
235240
extras['statussort'] = 'true' if statussort else 'false'
236241
extras['removeNewVersionNotif'] = 'true' if removeNewVersionNotif else 'false'
237242
extras['compname'] = compname
243+
extras['androidappid'] = androidappid
238244
extras['slogan'] = slogan if slogan else f"Developed By {appname}"
239245
extra_input = json.dumps(extras)
240246

requirements.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
django
22
requests
33
pillow
4-
python-dotenv
4+
python-dotenv
5+
gunicorn
6+
cryptography>=42.0.0

0 commit comments

Comments
 (0)