Skip to content

Commit 5b17711

Browse files
authored
[mob] Fix exif time parsing (#4985)
## Description ## Tests
2 parents 85bf3ee + b3d8e2e commit 5b17711

File tree

168 files changed

+2745
-3257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+2745
-3257
lines changed

.github/workflows/mobile-internal-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
- name: Build PlayStore AAB
4242
run: |
43-
flutter build appbundle --dart-define=cronetHttpNoPlay=true --release --flavor playstore
43+
flutter build appbundle --release --flavor playstore
4444
env:
4545
SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"
4646
SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS_PHOTOS }}

.github/workflows/mobile-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: Build independent APK
4747
run: |
48-
flutter build apk --dart-define=cronetHttpNoPlay=true --release --flavor independent
48+
flutter build apk --release --flavor independent
4949
mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente-${{ github.ref_name }}.apk
5050
env:
5151
SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"

auth/assets/custom-icons/_data/custom-icons.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@
2121
"title": "airtm",
2222
"hex": "000000"
2323
},
24-
{
25-
"title": "AJ Bell",
26-
"slug": "aj_bell",
27-
"hex": "c41230"
28-
},
2924
{
3025
"title": "aliyun",
3126
"altNames": [

auth/assets/custom-icons/icons/aj_bell.svg

Lines changed: 0 additions & 7 deletions
This file was deleted.

auth/lib/l10n/arb/app_ar.arb

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
"nextTotpTitle": "التالي",
4949
"deleteCodeTitle": "حذف الرمز؟",
5050
"deleteCodeMessage": "هل أنت متأكد من أنك تريد حذف هذه الشيفرة؟ هذا الإجراء لا رجعة فيه.",
51-
"trash": "سلة المهملات",
5251
"viewLogsAction": "عرض السجلات",
5352
"sendLogsDescription": "سوف يُرسل هذا السجلات لنا لمساعدتنا على تصحيح مشكلتك. بينما نتخذ الاحتياطات لضمان عدم تسجيل المعلومات الحساسة، نشجعك على رؤية هذه السجلات قبل مشاركتها.",
5453
"preparingLogsTitle": "جارٍ إعداد السجلات...",
@@ -198,8 +197,6 @@
198197
"enterDetailsManually": "أدخل التفاصيل يدوياً",
199198
"edit": "تعديل",
200199
"share": "مشاركة",
201-
"shareCodes": "شارك الرموز",
202-
"restore": "استعادة",
203200
"copiedToClipboard": "تم النسخ إلى الحافظة",
204201
"copiedNextToClipboard": "تم نسخ الرموز التالية إلى الحافظة",
205202
"error": "خطأ",
@@ -251,10 +248,6 @@
251248
"areYouSureYouWantToLogout": "هل أنت متأكد من أنك تريد تسجيل الخروج؟",
252249
"yesLogout": "نعم، تسجيل الخروج",
253250
"exit": "خروج",
254-
"theme": "السمة",
255-
"lightTheme": "فاتح",
256-
"darkTheme": "داكن",
257-
"systemTheme": "النظام",
258251
"verifyingRecoveryKey": "التحقق من مفتاح الاسترداد...",
259252
"recoveryKeyVerified": "تم التحقق من مفتاح الاسترداد",
260253
"recoveryKeySuccessBody": "رائع! مفتاح الاسترداد الخاص بك صالح. شكرا لك على التحقق.\n\nيرجى تذكر الاحتفاظ بنسخة احتياطية من مفتاح الاسترداد بشكل آمن.",
@@ -325,9 +318,6 @@
325318
}
326319
}
327320
},
328-
"manualSort": "مخصّص",
329-
"mostFrequentlyUsed": "مستخدم بكثرة",
330-
"mostRecentlyUsed": "مستخدمة مؤخراً",
331321
"activeSessions": "الجلسات النشطة",
332322
"somethingWentWrongPleaseTryAgain": "حدث خطأ ما، يرجى المحاولة مرة أخرى",
333323
"thisWillLogYouOutOfThisDevice": "سيؤدي هذا إلى تسجيل خروجك من هذا الجهاز!",
@@ -360,7 +350,6 @@
360350
"sigInBackupReminder": "يرجى تصدير الرموز الخاصة بك للتأكد من أن لديك نسخة احتياطية يمكنك استعادتها منها.",
361351
"offlineModeWarning": "لقد اخترت المضي قدما بدون نسخ احتياطية. يرجى أخذ نسخ احتياطية يدوية للتأكد من سلامة الرموز الخاصة بك.",
362352
"showLargeIcons": "إظهار أيقونات كبيرة",
363-
"compactMode": "الوضع المضغوط",
364353
"shouldHideCode": "إخفاء الرموز",
365354
"doubleTapToViewHiddenCode": "يمكنك النقر مرتين على أي عنصر لعرض الرمز",
366355
"focusOnSearchBar": "التركيز على البحث عند بدء التطبيق",
@@ -479,11 +468,5 @@
479468
"pinLock": "قفل رقم التعريف الشخصي",
480469
"enterPin": "أدخل رقم التعريف الشخصي",
481470
"setNewPin": "عين رقم تعريف شخصي جديد",
482-
"importFailureDescNew": "تعذر إعراب الملف المنتقى.",
483-
"duplicateCodes": "رموز مكررة",
484-
"noDuplicates": "✨ لا تكرارات",
485-
"youveNoDuplicateCodesThatCanBeCleared": "ليس لديك رموز مكررة يمكن مسحها",
486-
"deselectAll": "ألغِ تحديد الكل",
487-
"selectAll": "حدد الكل",
488-
"deleteDuplicates": "احذف التكرار"
471+
"importFailureDescNew": "تعذر إعراب الملف المنتقى."
489472
}

auth/lib/l10n/arb/app_hi.arb

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
},
99
"onBoardingGetStarted": "प्रारंभ करें",
1010
"setupFirstAccount": "अपना पहला अकाउंट सेटअप करें",
11-
"importScanQrCode": "एक QR कोड स्कैन करें",
11+
"importScanQrCode": "QR कोड स्कैन करें",
1212
"qrCode": "QR कोड",
1313
"importEnterSetupKey": "",
1414
"importAccountPageTitle": "अकाउंट विवरण डालें",
1515
"incorrectDetails": "ग़लत विवरण",
1616
"pleaseVerifyDetails": "कृपया विवरण सत्यापित करें और पुनः प्रयास करें",
17-
"codeIssuerHint": "ज़ारीकर्ता",
17+
"codeIssuerHint": "जारीकर्ता",
1818
"codeSecretKeyHint": "सीक्रेट कुंजी",
1919
"secret": "सीक्रेट",
2020
"all": "सभी",
@@ -39,10 +39,6 @@
3939
"pleaseLoginAgain": "कृपया फिर से लॉगिन करें",
4040
"loggingOut": "लॉग आउट हो रहा है...",
4141
"saveAction": "सेव करें",
42-
"deleteCodeMessage": "क्या आप वाकई इस कोड को हटाना चाहते हैं? इस क्रिया को वापस नहीं किया जा सकता",
43-
"trashCode": "?",
44-
"trashCodeMessage": "क्या आप वाकई {account} के लिए कोड नष्ट करना चाहते हैं?",
45-
"trash": "नष्ट करें",
4642
"viewLogsAction": "लॉग देखें",
4743
"preparingLogsTitle": "लॉग तैयार किये जा रहे हैं...",
4844
"emailLogsTitle": "लॉग ईमेल करें",
@@ -54,7 +50,6 @@
5450
}
5551
}
5652
},
57-
"copyEmailAction": "ईमेल कॉपी करें",
5853
"exportLogsAction": "लॉग एक्सपोर्ट करें",
5954
"reportABug": "बग रिपोर्ट करें",
6055
"reportBug": "बग रिपोर्ट करें",
@@ -84,24 +79,5 @@
8479
"cancel": "रद्द करें",
8580
"yes": "हाँ",
8681
"no": "नहीं",
87-
"settings": "सेटिंग",
88-
"pleaseTryAgain": "कृपया पुन: प्रयास करें",
89-
"newUser": "एंटे में नए उपयोगकर्ता",
90-
"delete": "हटाएं",
91-
"enterYourPasswordHint": "अपना पासवर्ड दर्ज करें",
92-
"forgotPassword": "पासवर्ड भूल गए",
93-
"oops": "ओह",
94-
"suggestFeatures": "विशेषताएं सुझाएं",
95-
"faq": "अक्सर किये गए सवाल",
96-
"somethingWentWrongMessage": "कुछ गड़बड़ हुई है, कृपया दोबारा प्रयास करें",
97-
"leaveFamily": "परिवार छोड़ें",
98-
"leaveFamilyMessage": "क्या आप सच में परिवार प्लान छोड़ना चाहते हैं?",
99-
"inFamilyPlanMessage": "आप परिवार प्लान पर हैं!",
100-
"hintForMobile": "कोड को संपादित करने या हटाने के लिए उसे लंबी देर तक दबाए।",
101-
"hintForDesktop": "कोड को संपादित करने या हटाने के लिए उस पर राइट क्लिक करें।",
102-
"scan": "स्कैन करें",
103-
"scanACode": "कोड स्कैन करें",
104-
"verify": "सत्यापित करें",
105-
"verifyEmail": "ईमेल सत्यापित करें",
106-
"twoFactorAuthTitle": "दो-चरणीय प्रमाणीकरण |"
82+
"settings": "सेटिंग"
10783
}

auth/lib/l10n/arb/app_tr.arb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@
8888
"useRecoveryKey": "Kurtarma anahtarını kullan",
8989
"incorrectPasswordTitle": "Yanlış şifre",
9090
"welcomeBack": "Tekrar hoş geldiniz!",
91-
"emailAlreadyRegistered": "E-posta zaten kayıtlı.",
92-
"emailNotRegistered": "E-posta kayıtlı değil.",
9391
"madeWithLoveAtPrefix": "❤️ ile şurada yapılmıştır ",
9492
"supportDevs": "Bu projeyi desteklemek için <bold-green>ente</bold-green> kanalına abone olun",
9593
"supportDiscount": "İlk yılda %10 indirim için \"AUTH\" kupon kodunu kullanın",
@@ -335,7 +333,6 @@
335333
}
336334
},
337335
"manualSort": "Özel",
338-
"editOrder": "Sıralamayı düzenle",
339336
"mostFrequentlyUsed": "Sık kullanılan",
340337
"mostRecentlyUsed": "Son kullanılan",
341338
"activeSessions": "Aktif oturumlar",
@@ -504,6 +501,5 @@
504501
"deselectAll": "Tümünün seçimini kaldır",
505502
"selectAll": "Tümünü seç",
506503
"deleteDuplicates": "Yinelenenleri sil",
507-
"plainHTML": "Sade HTML",
508-
"supportEnte": "<bold-Green>Ente</bold-Green>'yi destekle"
504+
"plainHTML": "Sade HTML"
509505
}

desktop/CHANGELOG.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
# CHANGELOG
22

3-
## v1.7.10 (Unreleased)
4-
5-
- .
6-
7-
## v1.7.9
3+
## v1.7.9 (Unreleased)
84

95
- Light mode.
106
- Faster and more stable thumbnail generation.
117
- Support `.supplemental-metadata` JSON files in Google Takeout.
8+
- .
129

1310
## v1.7.8
1411

desktop/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ente",
3-
"version": "1.7.10-beta",
3+
"version": "1.7.9-beta",
44
"private": true,
55
"description": "Desktop client for Ente Photos",
66
"repository": "github:ente-io/photos-desktop",
@@ -49,7 +49,7 @@
4949
"ajv": "^8.17.1",
5050
"concurrently": "^9.1.2",
5151
"cross-env": "^7.0.3",
52-
"electron": "^34.1.1",
52+
"electron": "^34.0.2",
5353
"electron-builder": "^26.0.0",
5454
"eslint": "^9",
5555
"prettier": "3.4.2",

desktop/src/main.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ const main = () => {
152152
void mainWindow.loadURL(rendererURL);
153153

154154
// Continue on with the rest of the startup sequence.
155-
Menu.setApplicationMenu(createApplicationMenu(mainWindow));
155+
Menu.setApplicationMenu(await createApplicationMenu(mainWindow));
156156
setupTrayItem(mainWindow);
157157
setupAutoUpdater(mainWindow);
158158

@@ -326,6 +326,8 @@ const attachProcessHandlers = () => {
326326
*/
327327
const waitForRendererDevServer = () => wait(1000);
328328

329+
const wipDesktopCustomTitlebar = process.env.ENTE_WIP_TITLEBAR == "1";
330+
329331
/**
330332
* Create an return the {@link BrowserWindow} that will form our app's UI.
331333
*
@@ -362,8 +364,12 @@ const createMainWindow = () => {
362364
// do it (Step 2) unconditionally (i.e., on macOS too).
363365
//
364366
// https://www.electronjs.org/docs/latest/tutorial/custom-title-bar#create-a-custom-title-bar
365-
titleBarStyle: "hidden",
366-
titleBarOverlay: true,
367+
...(wipDesktopCustomTitlebar
368+
? {
369+
titleBarStyle: "hidden",
370+
titleBarOverlay: true,
371+
}
372+
: {}),
367373
// The color to show in the window until the web content gets loaded.
368374
// https://www.electronjs.org/docs/latest/api/browser-window#setting-the-backgroundcolor-property
369375
//

0 commit comments

Comments
 (0)