Merge pull request #601 from syphon-org/dev

[release] version 0.2.10 (hotfix)

assets/translations/en-Shaw.json

@@ -0,0 +1,65 @@
+{
+    "title-intro": "𐑢𐑧𐑤𐑒𐑩𐑥 𐑑 {}",
+    "header-intro": "𐑐𐑮𐑦𐑝𐑩𐑕𐑦 𐑯 𐑓𐑮𐑰𐑛𐑩𐑥\n𐑢𐑦𐑞𐑬𐑑 𐑞 𐑣𐑨𐑕𐑩𐑤.",
+    "title-proxy-use-basic-authentication": "𐑿𐑟 𐑐𐑮𐑪𐑒𐑕𐑦 𐑷𐑔𐑧𐑯𐑑𐑦𐑒𐑱𐑖𐑩𐑯",
+    "title-dialog-captcha": "𐑒𐑩𐑥𐑐𐑤𐑰𐑑 ·𐑒𐑨𐑐𐑗𐑩",
+    "header-login": "𐑑𐑱𐑒 𐑚𐑨𐑒 𐑞 𐑗𐑨𐑑",
+    "header-signup-username": "𐑒𐑮𐑦𐑱𐑑 𐑩 𐑿𐑟𐑼𐑯𐑱𐑥",
+    "title-view-delete-devices": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑛𐑦𐑝𐑲𐑕 𐑮𐑦𐑥𐑵𐑝𐑩𐑤",
+    "title-view-search-groups": "𐑦𐑒𐑕𐑐𐑤𐑹 𐑜𐑮𐑵𐑐𐑕",
+    "title-view-search-users": "𐑕𐑻𐑗 𐑿𐑟𐑼𐑟",
+    "title-view-invite-users": "𐑦𐑯𐑝𐑲𐑑 𐑿𐑟𐑼𐑟",
+    "title-view-chat-users": "𐑷𐑤 𐑗𐑨𐑑 𐑿𐑟𐑼𐑟",
+    "title-view-create-group-public": "𐑒𐑮𐑦𐑱𐑑 𐑩 𐑐𐑳𐑚𐑤𐑦𐑒 𐑜𐑮𐑵𐑐",
+    "title-view-devices": "𐑛𐑦𐑝𐑲𐑕𐑩𐑟",
+    "title-view-settings": "𐑕𐑧𐑑𐑦𐑙𐑟",
+    "title-view-theming": "𐑩𐑐𐑽𐑩𐑯𐑕",
+    "title-view-invite": "𐑦𐑯𐑝𐑲𐑑",
+    "title-view-settings-chat": "𐑗𐑨𐑑𐑕",
+    "title-view-homeserver-search": "𐑓𐑲𐑯𐑛 𐑘𐑹 𐑣𐑴𐑥𐑕𐑻𐑝𐑼",
+    "title-proxy-host": "𐑥𐑪𐑛𐑦𐑓𐑲 𐑐𐑮𐑪𐑒𐑕𐑦 𐑣𐑴𐑕𐑑",
+    "title-proxy-port": "𐑥𐑪𐑛𐑦𐑓𐑲 𐑐𐑮𐑪𐑒𐑕𐑦 𐑐𐑹𐑑",
+    "title-proxy-username": "𐑥𐑪𐑛𐑦𐑓𐑲 𐑐𐑮𐑪𐑒𐑕𐑦 𐑿𐑟𐑼𐑯𐑱𐑥",
+    "title-proxy-password": "𐑥𐑪𐑛𐑦𐑓𐑲 𐑐𐑮𐑪𐑒𐑕𐑦 𐑐𐑭𐑕𐑢𐑻𐑛",
+    "title-search-unencrypted": "𐑕𐑻𐑗 𐑳𐑯𐑦𐑯𐑒𐑮𐑦𐑐𐑑𐑩𐑛",
+    "title-message-details": "𐑥𐑧𐑕𐑦𐑡 𐑛𐑰𐑑𐑱𐑤𐑟",
+    "title-send-media-message": "𐑕𐑧𐑯𐑛 𐑥𐑰𐑛𐑾 𐑥𐑧𐑕𐑦𐑡",
+    "title-send-media-message-unencrypted": "𐑕𐑧𐑯𐑛 𐑥𐑰𐑛𐑾 𐑥𐑧𐑕𐑦𐑡 (𐑳𐑯𐑦𐑯𐑒𐑮𐑦𐑐𐑑𐑩𐑛)",
+    "title-toggle-autocorrect": "𐑑𐑪𐑜𐑩𐑤 𐑒𐑰𐑚𐑹𐑛 𐑷𐑑𐑴𐑒𐑼𐑧𐑒𐑑",
+    "title-dialog-confirm-linkout": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑴𐑐𐑩𐑯𐑦𐑙 𐑤𐑦𐑙𐑒",
+    "title-dialog-encryption": "𐑦𐑯𐑒𐑮𐑦𐑐𐑑 𐑗𐑨𐑑?",
+    "title-dialog-email-requirement": "𐑰𐑥𐑱𐑤 𐑮𐑦𐑒𐑢𐑲𐑼𐑥𐑩𐑯𐑑",
+    "title-dialog-email-requirement-verified": "𐑰𐑥𐑱𐑤 𐑝𐑧𐑮𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯",
+    "title-device-rename": "𐑮𐑰𐑯𐑱𐑥 𐑩 𐑛𐑦𐑝𐑲𐑕",
+    "label-on": "𐑪𐑯",
+    "label-off": "𐑪𐑓",
+    "label-email": "𐑰𐑥𐑱𐑤",
+    "label-users": "𐑿𐑟𐑼𐑟",
+    "label-back": "𐑜𐑴 𐑚𐑨𐑒",
+    "label-close": "𐑒𐑤𐑴𐑕",
+    "label-send": "𐑕𐑧𐑯𐑛",
+    "label-download-image": "𐑤𐑴𐑛 𐑦𐑥𐑦𐑡",
+    "label-users-results": "𐑥𐑨𐑗𐑑 𐑿𐑟𐑼𐑟",
+    "title-verification": "𐑝𐑧𐑮𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯",
+    "title-view-create-group": "𐑒𐑮𐑦𐑱𐑑 𐑩 𐑜𐑮𐑵𐑐 𐑗𐑨𐑑",
+    "title-view-advanced": "𐑩𐑛𐑝𐑭𐑯𐑕𐑑",
+    "title-view-profile": "𐑕𐑧𐑑 𐑳𐑐 𐑘𐑹 𐑐𐑮𐑴𐑓𐑲𐑤",
+    "title-view-privacy": "𐑐𐑮𐑦𐑝𐑩𐑕𐑦 𐑯 𐑕𐑦𐑒𐑘𐑫𐑼𐑦𐑑𐑦",
+    "title-proxy-use-proxy": "𐑿𐑟 𐑩 𐑐𐑮𐑪𐑒𐑕𐑦",
+    "title-toggle-suggestions": "𐑑𐑪𐑜𐑩𐑤 𐑒𐑰𐑚𐑹𐑛 𐑢𐑻𐑛 𐑕𐑩𐑡𐑧𐑕𐑗𐑩𐑯𐑟",
+    "title-dialog-draft-preview": "𐑛𐑮𐑭𐑓𐑑 𐑐𐑮𐑰𐑝𐑿",
+    "subtitle-proxy-use-proxy": "𐑞𐑦𐑕 𐑢𐑦𐑤 𐑓𐑹𐑕 𐑷𐑤 𐑑𐑮𐑨𐑓𐑦𐑒 𐑤𐑰𐑝𐑦𐑙 ·𐑕𐑲𐑓𐑩𐑯 𐑑 𐑛𐑵 𐑕𐑴 𐑝𐑲𐑩 𐑩 𐑐𐑮𐑪𐑒𐑕𐑦",
+    "title-confirm-lock-overlay": "𐑐𐑤𐑰𐑟 𐑒𐑩𐑯𐑓𐑻𐑥 𐑐𐑭𐑕𐑒𐑴𐑛.",
+    "title-lock-overlay": "𐑐𐑤𐑰𐑟 𐑧𐑯𐑑𐑼 𐑐𐑭𐑕𐑒𐑴𐑛.",
+    "title-dialog-delete-keys": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑛𐑦𐑤𐑰𐑑𐑦𐑙 𐑒𐑰𐑟",
+    "title-dialog-terms": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑑𐑻𐑥𐑟 𐑝 𐑕𐑻𐑝𐑦𐑕",
+    "title-dialog-terms-alpha": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑴𐑐𐑩𐑯 𐑨𐑤𐑓𐑩 𐑑𐑻𐑥𐑟 𐑝 𐑕𐑻𐑝𐑦𐑕",
+    "title-dialog-accept-invite": "𐑩𐑒𐑕𐑧𐑐𐑑 𐑦𐑯𐑝𐑲𐑑?",
+    "title-user-verification": "𐑿𐑟𐑼 𐑝𐑧𐑮𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯",
+    "title-confirm-password": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑐𐑭𐑕𐑢𐑻𐑛",
+    "title-confirm-email": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑰𐑥𐑱𐑤",
+    "title-dialog-chat-color": "𐑕𐑦𐑤𐑧𐑒𐑑 𐑗𐑨𐑑 𐑒𐑳𐑤𐑼",
+    "subtitle-proxy-use-basic-authentication": "𐑐𐑮𐑩𐑝𐑲𐑛 𐑿𐑟𐑼𐑯𐑱𐑥 𐑯 𐑐𐑭𐑕𐑢𐑻𐑛 𐑑 𐑷𐑔𐑧𐑯𐑑𐑦𐑒𐑱𐑑 𐑢𐑦𐑞 𐑩 𐑐𐑮𐑪𐑒𐑕𐑦",
+    "label-users-recent": "𐑮𐑰𐑕𐑩𐑯𐑑 𐑿𐑟𐑼𐑟",
+    "label-users-known": "𐑯𐑴𐑯 𐑿𐑟𐑼𐑟"
+}

assets/translations/en.json

@@ -32,8 +32,8 @@
     "title-message-details": "Message Details",
     "title-send-media-message": "Send Media Message",
     "title-send-media-message-unencrypted": "Send Media Message (Unencrypted)",
-    "title-toggle-autocorrect": "Toggle keyboard autocorrect",
-    "title-toggle-suggestions": "Toggle keyboard word suggestions",
+    "title-toggle-autocorrect": "Keyboard autocorrect",
+    "title-toggle-suggestions": "Keyboard word suggestions",
     "title-dialog-delete-keys": "Confirm Deleting Keys",
     "title-dialog-confirm-linkout": "Confirm Opening Link",
     "title-dialog-encryption": "Encrypt Chat?",

assets/translations/fr.json

@@ -237,10 +237,10 @@
     "list-item-advanced-settings-start-background": "Démarrer le service en arrière-plan",
     "list-item-advanced-settings-force-function": "Forcer la fonction",
     "list-item-advanced-settings-test-notifications": "Tester les notifications",
-    "list-item-via": "Via",
+    "list-item-via": "Plateforme",
     "list-item-sent": "Envoyé",
     "content-dialog-confirm-password": "Veuillez confirmer votre mot de passe (Par défaut)",
-    "message-edited-append": " (Modifié)",
+    "message-edited-append": " (modifié)",
     "label-default": "Par défaut",
     "semantics-image-intro": "Utilisateur détendu, allongé",
     "title-send-media-message-unencrypted": "Envoyer un média (non chiffré)",
@@ -267,5 +267,6 @@
     "list-item-chat-detail-vibrate": "Vibration",
     "content-notification-style-type-inbox": "Regrouper les nouveaux messages dans une même notification",
     "content-notification-style-type-latest": "Afficher une notification avec le message le plus récent",
-    "content-notification-style-type-itemized": "Une nouvelle notification apparaîtra pour chaque nouveau message"
+    "content-notification-style-type-itemized": "Une nouvelle notification apparaîtra pour chaque nouveau message",
+    "label-show-attachment-options": "Ouvrir les options de pièce jointe"
 }

assets/translations/id.json

@@ -9,7 +9,7 @@
     "title-view-create-group": "Buat Sebuah Grup Obrolan",
     "title-view-invite": "Undang",
     "title-view-settings-chat": "Obrolan",
-    "title-view-privacy": "Privasi",
+    "title-view-privacy": "Privasi & Keamanan",
     "title-view-homeserver-search": "Temukan Homeserver Anda",
     "title-view-profile": "Siapkan Profil Anda",
     "title-proxy-host": "Modifikasi Host Proksi",
@@ -226,12 +226,12 @@
     "list-item-advanced-settings-force-function": "Paksakan Fungsi",
     "list-item-sent": "Terkirim",
     "list-item-received": "Diterima",
-    "list-item-via": "Via",
+    "list-item-via": "Platform",
     "alert-offline": "Sepertinya Anda mungkin offline. Periksa koneksi Anda dan coba lagi.",
     "alert-unknown": "Terjadi Kesalahan Yang Tidak Diketahui",
     "alert-could-not-launch-url": "Tidak dapat membuka {}",
     "alert-no-images-found": "Tidak Ada Gambar Yang Ditemukan.",
-    "message-edited-append": " (Diedit)",
+    "message-edited-append": " (diedit)",
     "label-default": "Default",
     "semantics-image-intro": "Pengguna menyantai",
     "semantics-image-private-message": "Seseorang membawa sebuah gelembung pesan privat",
@@ -267,5 +267,6 @@
     "content-notification-style-type-inbox": "Kelompokkan pesan baru dalam satu notifikasi",
     "content-notification-style-type-itemized": "Sebuah notifikasi baru akan muncul untuk setiap pesan baru",
     "list-item-chat-detail-vibrate": "Getaran",
-    "content-notification-style-type-latest": "Tampilkan satu notifikasi dengan pesan terbaru"
+    "content-notification-style-type-latest": "Tampilkan satu notifikasi dengan pesan terbaru",
+    "label-show-attachment-options": "Buka opsi lampiran"
 }

assets/translations/uk.json

@@ -267,5 +267,6 @@
     "semantics-image-empty-chat-list": "Кілька крихітних, милих монстрів, що виглядають з-за листя.",
     "semantics-image-terms-of-service": "Рука тримає телефон з прапорцем умов про надання послуг",
     "semantics-image-signup-username": "Людина, що спирається ліктем на ID-картку",
-    "semantics-image-password-reset": "Людина, що поклала розслаблену руку на лист із прапорцем всередині"
+    "semantics-image-password-reset": "Людина, що поклала розслаблену руку на лист із прапорцем всередині",
+    "label-show-attachment-options": "Відкрити параметри вкладення"
 }

fastlane/metadata/android/en-US/changelogs/2100.txt

@@ -0,0 +1,25 @@
+0.2.10
+
+🔥 Hot Fixes
+- Crypto Storage performance issues
+- Fixed Wordle
+
+🔮 New Features
+- Session Key Imports / Exports
+- Email and other 3pid auth support
+- Fullscreen Image View
+- Incoming Read Receipt Support
+- Toggle autocorrect setting
+
+🐛 Bug Fixes
+- fixed missing several translations
+- fixed various notification issues
+- fixed issues with deleting devices
+- fixed issues deactivating accounts
+- fixed showing TOS more than once
+
+💡 Improvements
+- Hide Send Button 
+
+📐 Refactoring
+- Lots!

ios/Runner.xcodeproj/project.pbxproj

@@ -355,7 +355,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2007;
+				CURRENT_PROJECT_VERSION = 2090;
 				DEVELOPMENT_TEAM = W98LUTKH5G;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -371,7 +371,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.2.6;
+				MARKETING_VERSION = 0.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = org.tether.tether;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -496,7 +496,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2007;
+				CURRENT_PROJECT_VERSION = 2090;
 				DEVELOPMENT_TEAM = W98LUTKH5G;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -512,7 +512,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.2.6;
+				MARKETING_VERSION = 0.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = org.tether.tether;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -529,7 +529,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2007;
+				CURRENT_PROJECT_VERSION = 2090;
 				DEVELOPMENT_TEAM = W98LUTKH5G;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -545,7 +545,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.2.6;
+				MARKETING_VERSION = 0.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = org.tether.tether;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

lib/cache/middleware.dart

@@ -22,11 +22,9 @@ bool cacheMiddleware(Store<AppState> store, dynamic action) {
     case UpdateRoom:
     case SetRoom:
     case RemoveRoom:
-    case SetOlmAccount:
     case SetOlmAccountBackup:
     case SetDeviceKeysOwned:
     case AddKeySession:
-    case AddMessageSessionInbound:
     case AddMessageSessionOutbound:
     case SetUser:
     case ResetCrypto:

lib/cache/serializer.dart

@@ -9,6 +9,7 @@ import 'package:syphon/cache/threadables.dart';
 import 'package:syphon/global/print.dart';
 import 'package:syphon/storage/constants.dart';
 import 'package:syphon/store/auth/state.dart';
+import 'package:syphon/store/crypto/sessions/model.dart';
 import 'package:syphon/store/crypto/state.dart';
 import 'package:syphon/store/events/messages/model.dart';
 import 'package:syphon/store/events/reactions/model.dart';
@@ -141,10 +142,17 @@ class CacheSerializer implements StateSerializer<AppState> {
     final cryptoState =
         cryptoStore ?? preloaded[StorageKeys.CRYPTO] as CryptoStore? ?? CryptoStore();
 
+    final messageSessionsLoaded =
+        preloaded[StorageKeys.MESSAGE_SESSIONS] as Map<String, Map<String, List<MessageSession>>>;
+
     return AppState(
       loading: false,
       authStore: authStore ?? preloaded[StorageKeys.AUTH] ?? AuthStore(),
-      cryptoStore: cryptoState.upgradeSessions_temp(),
+      cryptoStore: messageSessionsLoaded.isEmpty
+          ? cryptoState.upgradeSessions_temp()
+          : cryptoState.upgradeSessions_temp().copyWith(
+                messageSessionsInbound: preloaded[StorageKeys.MESSAGE_SESSIONS],
+              ),
       settingsStore: preloaded[StorageKeys.SETTINGS] ?? settingsStore ?? SettingsStore(),
       syncStore: syncStore ?? SyncStore(),
       mediaStore: mediaStore ?? MediaStore().copyWith(mediaCache: preloaded[StorageKeys.MEDIA]),

lib/global/libs/matrix/devices.dart

@@ -55,12 +55,12 @@ abstract class Devices {
     return await json.decode(response.body);
   }
 
-  /**
- * https://matrix.org/docs/spec/client_server/latest#id414
- *  
- * HTTP:DELETE
- * Gets all currently active pushers for the authenticated user.
- */
+  ///
+  /// https://matrix.org/docs/spec/client_server/latest#id414
+  ///
+  /// HTTP:DELETE
+  /// Gets all currently active pushers for the authenticated user.
+  ///
   static Future<dynamic> deleteDevices({
     String? protocol = 'https://',
     String? homeserver = Values.homeserverDefault,
@@ -100,12 +100,10 @@ abstract class Devices {
     return await json.decode(response.body);
   }
 
-  /**
-   * https://spec.matrix.org/unstable/client-server-api/#put_matrixclientv3devicesdeviceid
-   *
-   * HTTP:PUT
-   * Change a given Device's public display name.
-   */
+  /// https://spec.matrix.org/unstable/client-server-api/#put_matrixclientv3devicesdeviceid
+  ///
+  /// HTTP:PUT
+  /// Change a given Device's public display name.
   static Future<dynamic> renameDevice({
     String? protocol = 'https://',
     String? homeserver = Values.homeserverDefault,
@@ -132,5 +130,4 @@ abstract class Devices {
 
     return await json.decode(response.body);
   }
-
 }

lib/global/print.dart

@@ -1,35 +1,51 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+import 'package:syphon/global/values.dart';
 
 typedef PrintJson = void Function(Map? jsonMap);
 typedef PrintDebug = void Function(String message, {String title});
 typedef PrintError = void Function(String message, {String? title});
 
 void _printInfo(String content, {String? title}) {
   final output = title != null ? '[$title] $content' : content;
-  print(output);
+  if (DEBUG_MODE) {
+    print(output);
+  }
 }
 
 void _printWarning(String content, {String? title}) {
   final output = title != null ? '[$title] $content' : content;
-  print(output);
+  if (DEBUG_MODE) {
+    print(output);
+  }
 }
 
 void _printError(String content, {String? title}) {
+  final output = title != null ? '[$title] $content' : content;
+  if (DEBUG_MODE) {
+    print(output);
+  }
+}
+
+void _printRelease(String content, {String? title}) {
   final output = title != null ? '[$title] $content' : content;
   print(output);
 }
 
 void _printDebug(String content, {String? title}) {
   final output = title != null ? '[$title] $content' : content;
-  debugPrint(output);
+  if (DEBUG_MODE) {
+    debugPrint(output);
+  }
 }
 
 void _printJson(Map? jsonMap) {
   final JsonEncoder encoder = JsonEncoder.withIndent('  ');
   final String prettyEvent = encoder.convert(jsonMap);
-  debugPrint(prettyEvent, wrapWidth: 2048);
+  if (DEBUG_MODE) {
+    debugPrint(prettyEvent, wrapWidth: 2048);
+  }
 }
 
 PrintJson printJson = _printJson;
@@ -45,5 +61,6 @@ class log {
   static warn(String content, {String? title}) => _printWarning(content, title: title);
   static error(String content, {String? title}) => _printError(content, title: title);
   static debug(String content, {String? title}) => _printDebug(content, title: title);
+  static release(String content, {String? title}) => _printRelease(content, title: title);
   static json(Map? json) => _printJson(json);
 }

lib/storage/constants.dart

@@ -18,6 +18,9 @@ class StorageKeys {
   static const String RECEIPTS = 'receipts';
   static const String REACTIONS = 'reactions';
   static const String REDACTIONS = 'redactions';
+
+  // crypto
+  static const String MESSAGE_SESSIONS = 'message_sessions';
 }
 
 enum StorageKey {
@@ -33,7 +36,8 @@ enum StorageKey {
   decrypted,
   receipts,
   reactions,
-  redactions
+  redactions,
+  messageSessions,
 }
 
 const int DEFAULT_LOAD_LIMIT = 25;