android/app/build.gradle.kts

@@ -34,8 +34,6 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = true
-            isShrinkResources = true
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig = signingConfigs.getByName("debug")
@@ -52,3 +50,12 @@ dependencies {
     implementation(platform("com.google.firebase:firebase-bom:34.12.0"))
     implementation("com.google.firebase:firebase-messaging")
 }
+
+configurations.all {
+    resolutionStrategy.eachDependency {
+        if (requested.group == "com.arthenica" && requested.name.startsWith("ffmpeg-kit")) {
+            useVersion("6.0.3")
+            because("Фикс падения сборки на версии 6.0.3+2-LTS")
+        }
+    }
+}

android/app/proguard-rules.pro

@@ -1,15 +0,0 @@
-# Защита ffmpeg-kit от R8
--keep class com.arthenica.ffmpegkit.** { *; }
--keep interface com.arthenica.ffmpegkit.** { *; }
-
-# Защита от удаления нативных методов JNI
--keepclassmembers class * {
-    native <methods>;
-}
-
-# Если используете конкретно ваш форк, добавим и его:
--keep class com.antonkarpenko.ffmpegkit.** { *; }
-
-# Защита Firebase (если падает Firebase, когда включен R8)
--keep class com.google.firebase.** { *; }
--keep class com.google.android.gms.** { *; }

android/app/src/main/kotlin/ru/chepuhagram/app/MainActivity.kt

@@ -1,45 +1,5 @@
 package ru.chepuhagram.app
 
-import android.app.AlertDialog
-import android.os.Bundle
 import io.flutter.embedding.android.FlutterFragmentActivity
-import io.flutter.embedding.engine.FlutterEngine
 
-class MainActivity : FlutterFragmentActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        try {
-            super.onCreate(savedInstanceState)
-        } catch (e: UnsatisfiedLinkError) {
-            handleFatalStartupError("Ошибка загрузки нативных библиотек: ${e.message}")
-        } catch (e: Exception) {
-            handleFatalStartupError("Произошла системная ошибка при запуске: ${e.message}")
-        }
-    }
-
-    // Дополнительная защита при создании движка, если инициализация происходит там
-    override fun provideFlutterEngine(context: android.content.Context): FlutterEngine? {
-        return try {
-            super.provideFlutterEngine(context)
-        } catch (e: UnsatisfiedLinkError) {
-            handleFatalStartupError("Ошибка инициализации движка (FFmpegKit): ${e.message}")
-            null // Возвращаем null, чтобы предотвратить дальнейший краш
-        }
-    }
-
-    private fun handleFatalStartupError(message: String) {
-        // Мы не можем использовать стандартные диалоги из темы Activity, 
-        // так как они могут быть повреждены, используем чистый Android AlertDialog
-        runOnUiThread {
-            AlertDialog.Builder(this)
-                .setTitle("Критическая ошибка")
-                .setMessage("Приложение не может быть запущено на данном устройстве.\n\nТехническая информация: $message")
-                .setPositiveButton("Закрыть") { _, _ -> 
-                    finishAffinity() // Полностью закрывает приложение
-                }
-                .setCancelable(false)
-                .create()
-                .show()
-        }
-    }
-}
+class MainActivity : FlutterFragmentActivity()

lib/domain/services/api_service.dart

@@ -288,14 +288,7 @@ class ApiService extends ChangeNotifier {
   }
 
   Future<String?> getAccessToken() async {
-    String? token;
-    try {
-      token = await _storage.read(key: 'access_token');
-    } catch (_) {
-      throw Exception(
-        'Критическая ошибка инициализации внутренних библиотек.\n Приложение не может продолжить работу. \n Обратитесь к разработчику. \n Код ошибки: _apis_gat_1',
-      );
-    }
+    String? token = await _storage.read(key: 'access_token');
 
     if (token != null) {
       bool isExpiredSoon =

lib/logic/auth_provider.dart

@@ -94,11 +94,7 @@ class AuthProvider extends ChangeNotifier {
 
   SocketService get socketService => _socketService;
 
-  Future<bool> login(
-    String username,
-    String password, {
-    String? totpCode,
-  }) async {
+  Future<bool> login(String username, String password, {String? totpCode}) async {
     _isLoading = true;
     notifyListeners();
 
@@ -184,14 +180,7 @@ class AuthProvider extends ChangeNotifier {
   }
 
   Future<bool> tryAutoLogin() async {
-    String? token;
-    try {
-      token = await _apiService.getAccessToken();
-    } catch (e) {
-      throw Exception(
-        '$e+_aup_tal_1',
-      );
-    }
+    final token = await _apiService.getAccessToken();
     if (token == null) return false;
 
     // Загружаем currentUserId из хранилища
@@ -292,9 +281,7 @@ class AuthProvider extends ChangeNotifier {
         _email = data['email']?.toString();
         _about = data['about']?.toString();
         final avatarFileId = data['avatar_file_id']?.toString();
-        _avatarUrl = avatarFileId != null
-            ? '${AppConstants.baseUrl}/media/$avatarFileId'
-            : null;
+        _avatarUrl = avatarFileId != null ? '${AppConstants.baseUrl}/media/$avatarFileId' : null;
 
         // Загружаем локальные настройки
         _avatarPath = await _storage.read(key: 'avatar_path');

lib/main.dart

@@ -124,101 +124,94 @@ void _navigateToChat(int senderId) {
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  try {
-    await Firebase.initializeApp();
+  await Firebase.initializeApp();
 
-    initialMessage = await FirebaseMessaging.instance.getInitialMessage();
-    print('Initial message from main() after delay: $initialMessage');
-    // Сохраняем информацию в SharedPreferences для надежности
-    final prefs = await SharedPreferences.getInstance();
-    if (initialMessage != null) {
-      print('App launched from notification: ${initialMessage!.data}');
-      print('Message type: ${initialMessage!.data['type']}');
-      print('Sender ID: ${initialMessage!.data['sender_id']}');
+  await Future.delayed(const Duration(milliseconds: 500));
+  initialMessage = await FirebaseMessaging.instance.getInitialMessage();
+  print('Initial message from main() after delay: $initialMessage');
+  // Сохраняем информацию в SharedPreferences для надежности
+  final prefs = await SharedPreferences.getInstance();
+  if (initialMessage != null) {
+    print('App launched from notification: ${initialMessage!.data}');
+    print('Message type: ${initialMessage!.data['type']}');
+    print('Sender ID: ${initialMessage!.data['sender_id']}');
 
-      final payloadString = jsonEncode(initialMessage!.data);
-      final lastHandled = prefs.getString(
+    final payloadString = jsonEncode(initialMessage!.data);
+    final lastHandled = prefs.getString(
+      _lastHandledNotificationLaunchPayloadKey,
+    );
+    if (lastHandled != payloadString) {
+      // Сохраняем данные уведомления
+      await prefs.setString(_notificationLaunchKey, payloadString);
+      await prefs.setString(
         _lastHandledNotificationLaunchPayloadKey,
+        payloadString,
       );
-      if (lastHandled != payloadString) {
-        // Сохраняем данные уведомления
-        await prefs.setString(_notificationLaunchKey, payloadString);
-        await prefs.setString(
-          _lastHandledNotificationLaunchPayloadKey,
-          payloadString,
-        );
-        print('Saved notification data to SharedPreferences');
-      } else {
-        print('InitialMessage payload already handled earlier, skipping');
-      }
+      print('Saved notification data to SharedPreferences');
     } else {
-      print('No initial message - app launched normally');
-      // Очищаем сохраненные данные, если приложение запущено нормально
-      await prefs.remove(_notificationLaunchKey);
+      print('InitialMessage payload already handled earlier, skipping');
     }
+  } else {
+    print('No initial message - app launched normally');
+    // Очищаем сохраненные данные, если приложение запущено нормально
+    await prefs.remove(_notificationLaunchKey);
+  }
 
-    // Initialize local notifications
-    const AndroidInitializationSettings initializationSettingsAndroid =
-        AndroidInitializationSettings('@mipmap/ic_launcher');
-    final InitializationSettings initializationSettings =
-        InitializationSettings(android: initializationSettingsAndroid);
-    await flutterLocalNotificationsPlugin.initialize(
-      initializationSettings,
-      onDidReceiveNotificationResponse: _onSelectNotification,
-    );
+  // Initialize local notifications
+  const AndroidInitializationSettings initializationSettingsAndroid =
+      AndroidInitializationSettings('@mipmap/ic_launcher');
+  final InitializationSettings initializationSettings = InitializationSettings(
+    android: initializationSettingsAndroid,
+  );
+  await flutterLocalNotificationsPlugin.initialize(
+    initializationSettings,
+    onDidReceiveNotificationResponse: _onSelectNotification,
+  );
 
-    // Если приложение было запущено из локального уведомления, сохраним payload
-    final notificationAppLaunchDetails = await flutterLocalNotificationsPlugin
-        .getNotificationAppLaunchDetails();
-    if (notificationAppLaunchDetails?.didNotificationLaunchApp ?? false) {
-      final payload =
-          notificationAppLaunchDetails?.notificationResponse?.payload;
-      print('App launched from local notification, payload: $payload');
-      if (payload != null && payload.isNotEmpty) {
-        try {
-          final lastHandled = prefs.getString(
+  // Если приложение было запущено из локального уведомления, сохраним payload
+  final notificationAppLaunchDetails = await flutterLocalNotificationsPlugin
+      .getNotificationAppLaunchDetails();
+  if (notificationAppLaunchDetails?.didNotificationLaunchApp ?? false) {
+    final payload = notificationAppLaunchDetails?.notificationResponse?.payload;
+    print('App launched from local notification, payload: $payload');
+    if (payload != null && payload.isNotEmpty) {
+      try {
+        final lastHandled = prefs.getString(
+          _lastHandledNotificationLaunchPayloadKey,
+        );
+        if (lastHandled != payload) {
+          final data = jsonDecode(payload);
+          await prefs.setString(_notificationLaunchKey, jsonEncode(data));
+          await prefs.setString(
             _lastHandledNotificationLaunchPayloadKey,
+            payload,
           );
-          if (lastHandled != payload) {
-            final data = jsonDecode(payload);
-            await prefs.setString(_notificationLaunchKey, jsonEncode(data));
-            await prefs.setString(
-              _lastHandledNotificationLaunchPayloadKey,
-              payload,
-            );
-            print(
-              'Saved local notification launch payload to SharedPreferences',
-            );
-          } else {
-            print(
-              'Local notification payload already handled earlier, skipping',
-            );
-          }
-        } catch (e) {
-          print('Failed to save notification launch payload: $e');
+          print('Saved local notification launch payload to SharedPreferences');
+        } else {
+          print('Local notification payload already handled earlier, skipping');
         }
+      } catch (e) {
+        print('Failed to save notification launch payload: $e');
       }
     }
-
-    // Create notification channel for Android 8+
-    const AndroidNotificationChannel channel = AndroidNotificationChannel(
-      'chat_id', // id
-      'Messages', // title
-      description: 'Chat messages notifications', // description
-      importance: Importance.high,
-    );
-
-    await flutterLocalNotificationsPlugin
-        .resolvePlatformSpecificImplementation<
-          AndroidFlutterLocalNotificationsPlugin
-        >()
-        ?.createNotificationChannel(channel);
-
-    FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
-  } catch (e) {
-    print('Уведосления не были инициальзированы: $e');
   }
 
+  // Create notification channel for Android 8+
+  const AndroidNotificationChannel channel = AndroidNotificationChannel(
+    'chat_id', // id
+    'Messages', // title
+    description: 'Chat messages notifications', // description
+    importance: Importance.high,
+  );
+
+  await flutterLocalNotificationsPlugin
+      .resolvePlatformSpecificImplementation<
+        AndroidFlutterLocalNotificationsPlugin
+      >()
+      ?.createNotificationChannel(channel);
+
+  FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
+
   runApp(
     MultiProvider(
       providers: [

lib/presentation/screens/chat_screen.dart

@@ -2149,13 +2149,8 @@ class _ChatScreenState extends State<ChatScreen> with RouteAware {
         previewText = rawText;
       } else if (hasMedia) {
         previewText = switch (messageType) {
-<<<<<<< HEAD
-          MessageType.videoNote => "[Кружок]",
-          MessageType.voiceNote => "[Голосовое]",
-=======
           MessageType.voiceNote => "[Кружок}",
           MessageType.videoNote => "[Голосовое]",
->>>>>>> 4b306f3ceef54b88bb73fa4130a0e501641e6ca8
           MessageType.image => "[Фото]",
           MessageType.video => "[Видео]",
           MessageType.file => "[Файл]",

lib/presentation/screens/splash_screen.dart

@@ -67,16 +67,7 @@ class _SplashScreenState extends State<SplashScreen> {
 
     // 2. Пытаемся выполнить автологин
     final authProvider = context.read<AuthProvider>();
-    bool? isLoggedIn;
-    try {
-      isLoggedIn = await authProvider.tryAutoLogin();
-    } catch (e) {
-      setState(() {
-        connectError =
-            '$e+_sps_init_1'.replaceAll('Exception: ', '');
-      });
-      return;
-    }
+    final isLoggedIn = await authProvider.tryAutoLogin();
 
     if (!mounted) return;
     bool connected = false;