feat: improve explanation of update being unusable

Share APK has a requirement of needing to install the patched app before sharing, this PR removes that as I see no reason for this restriction

.github/workflows/release-build.yml

@@ -19,11 +19,6 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           channel: 'stable'
-      - uses: SpicyPizza/create-envfile@v1
-        with:
-          envkey_sentryDSN: ${{ secrets.SENTRY_DSN }}
-          envkey_apiKey: ${{ secrets.API_KEY }}
-          envkey_appId: ${{ secrets.APP_ID }}
       - name: Set up Flutter
         run: flutter pub get
       - name: Generate files with Builder

.gitignore

@@ -136,6 +136,3 @@ app.*.map.json
 
 Firebase related
 .firebase
-
-# Environment variables
-android/app/google-services.json

assets/i18n/en_US.json

@@ -16,6 +16,7 @@
         "patchedSubtitle": "Patched Applications",
         "updatesAvailable": "Updates available",
         "noUpdates": "No updates available",
+        "WIP": "Work In Progress",
         "noInstallations": "No patched applications installed",
         "installed": "Installed",
         "updateDialogTitle": "Update Manager",
@@ -26,7 +27,8 @@
         "installingMessage": "Installing update...",
         "errorDownloadMessage": "Unable to download update",
         "errorInstallMessage": "Unable to install update",
-        "noConnection": "No internet connection"
+        "noConnection": "No internet connection",
+        "updatesDisabled": "Updating a patched app is currently disabled. Repatch the app again."
     },
     "applicationItem": {
         "patchButton": "Patch",
@@ -134,8 +136,6 @@
         "snackbarMessage": "Copied to clipboard",
         "sentryLabel": "Sentry Logging",
         "sentryHint": "Send anonymous logs to help us improve ReVanced Manager",
-        "firebaseCrashlyticsLabel": "Firebase Crashlytics",
-        "firebaseCrashlyticsHint": "Send anonymous crash reports to help us improve ReVanced Manager",
         "restartAppForChanges": "Restart the app to apply changes",
         "deleteKeystoreLabel": "Delete keystore",
         "deleteKeystoreHint": "Delete the keystore used to sign the app",

lib/firebase_options.dart

@@ -1,63 +0,0 @@
-// File generated by FlutterFire CLI.
-// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members
-import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
-import 'package:flutter/foundation.dart'
-    show defaultTargetPlatform, kIsWeb, TargetPlatform;
-import 'package:flutter_dotenv/flutter_dotenv.dart';
-
-/// Default [FirebaseOptions] for use with your Firebase apps.
-///
-/// Example:
-/// ```dart
-/// import 'firebase_options.dart';
-/// // ...
-/// await Firebase.initializeApp(
-///   options: DefaultFirebaseOptions.currentPlatform,
-/// );
-/// ```
-class DefaultFirebaseOptions {
-  static FirebaseOptions get currentPlatform {
-    if (kIsWeb) {
-      throw UnsupportedError(
-        'DefaultFirebaseOptions have not been configured for web - '
-        'you can reconfigure this by running the FlutterFire CLI again.',
-      );
-    }
-    switch (defaultTargetPlatform) {
-      case TargetPlatform.android:
-        return android;
-      case TargetPlatform.iOS:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions have not been configured for ios - '
-          'you can reconfigure this by running the FlutterFire CLI again.',
-        );
-      case TargetPlatform.macOS:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions have not been configured for macos - '
-          'you can reconfigure this by running the FlutterFire CLI again.',
-        );
-      case TargetPlatform.windows:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions have not been configured for windows - '
-          'you can reconfigure this by running the FlutterFire CLI again.',
-        );
-      case TargetPlatform.linux:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions have not been configured for linux - '
-          'you can reconfigure this by running the FlutterFire CLI again.',
-        );
-      default:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions are not supported for this platform.',
-        );
-    }
-  }
-
-  static FirebaseOptions android = FirebaseOptions(
-    apiKey: dotenv.env['apiKey'] ?? '',
-    appId: dotenv.env['appId'] ?? '',
-    messagingSenderId: '1006104807752',
-    projectId: 'revanced-manager',
-    storageBucket: 'revanced-manager.appspot.com',
-  );
-}

lib/main.dart

@@ -1,4 +1,3 @@
-import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -12,62 +11,43 @@ import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
 import 'package:stacked_themes/stacked_themes.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:timezone/data/latest.dart' as tz;
-import 'package:firebase_core/firebase_core.dart';
-import 'firebase_options.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 Future main() async {
-  await dotenv.load(fileName: ".env");
   await ThemeManager.initialise();
   await setupLocator();
   WidgetsFlutterBinding.ensureInitialized();
   await locator<ManagerAPI>().initialize();
   String apiUrl = locator<ManagerAPI>().getApiUrl();
   await locator<RevancedAPI>().initialize(apiUrl);
-  bool isSentryEnabled = locator<ManagerAPI>().isSentryEnabled();
+  // bool isSentryEnabled = locator<ManagerAPI>().isSentryEnabled();
-  bool isCrashlyticsEnabled = locator<ManagerAPI>().isCrashlyticsEnabled();
-  // Remove this section if you are building from source and don't have firebase config
-  if (isCrashlyticsEnabled) {
-    await Firebase.initializeApp(
-      options: DefaultFirebaseOptions.currentPlatform,
-    );
-    Firebase.app().setAutomaticDataCollectionEnabled(true);
-  } else {
-    await Firebase.initializeApp(
-      options: DefaultFirebaseOptions.currentPlatform,
-    );
-    Firebase.app().setAutomaticDataCollectionEnabled(false);
-  }
   locator<GithubAPI>().initialize();
   await locator<PatcherAPI>().initialize();
   tz.initializeTimeZones();
 
   // Remove this section if you are building from source and don't have sentry configured
-  await SentryFlutter.init(
+  // await SentryFlutter.init(
-    (options) {
+  //   (options) {
-      options
+  //     options
-        ..dsn = isSentryEnabled ? dotenv.env['sentryDSN'] : ''
+  //       ..dsn = isSentryEnabled ? '' : ''
-        ..environment = 'alpha'
+  //       ..environment = 'alpha'
-        ..release = '0.1'
+  //       ..release = '0.1'
-        ..tracesSampleRate = 1.0
+  //       ..tracesSampleRate = 1.0
-        ..anrEnabled = true
+  //       ..anrEnabled = true
-        ..enableOutOfMemoryTracking = true
+  //       ..enableOutOfMemoryTracking = true
-        ..sampleRate = isSentryEnabled ? 1.0 : 0.0
+  //       ..sampleRate = isSentryEnabled ? 1.0 : 0.0
-        ..beforeSend = (event, hint) {
+  //       ..beforeSend = (event, hint) {
-          if (isSentryEnabled) {
+  //         if (isSentryEnabled) {
-            return event;
+  //           return event;
-          } else {
+  //         } else {
-            return null;
+  //           return null;
-          }
+  //         }
-        } as BeforeSendCallback?;
+  //       } as BeforeSendCallback?;
-    },
+  //   },
-    appRunner: () {
+  //   appRunner: () {
-      if (isCrashlyticsEnabled) {
+  //     runApp(const MyApp());
-        FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterError;
+  //   },
-      }
+  // );
-      runApp(const MyApp());
+  runApp(const MyApp());
-    },
-  );
 }
 
 class MyApp extends StatelessWidget {

lib/services/manager_api.dart

@@ -82,21 +82,13 @@ class ManagerAPI {
     await _prefs.setBool('useDarkTheme', value);
   }
 
-  bool isSentryEnabled() {
+  // bool isSentryEnabled() {
-    return _prefs.getBool('sentryEnabled') ?? true;
+  //   return _prefs.getBool('sentryEnabled') ?? true;
-  }
+  // }
 
-  Future<void> setSentryStatus(bool value) async {
+  // Future<void> setSentryStatus(bool value) async {
-    await _prefs.setBool('sentryEnabled', value);
+  //   await _prefs.setBool('sentryEnabled', value);
-  }
+  // }
-
-  bool isCrashlyticsEnabled() {
-    return _prefs.getBool('crashlyticsEnabled') ?? true;
-  }
-
-  Future<void> setCrashlyticsStatus(bool value) async {
-    await _prefs.setBool('crashlyticsEnabled', value);
-  }
 
   Future<void> deleteTempFolder() async {
     final Directory dir = Directory('/data/local/tmp/revanced-manager');
@@ -107,7 +99,7 @@ class ManagerAPI {
 
   Future<void> deleteKeystore() async {
     final File keystore = File(
-        '/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-keystore.keystore');
+        '/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-manager.keystore');
     if (await keystore.exists()) {
       await keystore.delete();
     }

lib/ui/views/home/home_view.dart

@@ -67,20 +67,20 @@ class HomeView extends StatelessWidget {
                       const SizedBox(height: 8),
                       Row(
                         children: <Widget>[
-                          DashboardChip(
-                            label: I18nText('homeView.updatesAvailable'),
-                            isSelected: model.showUpdatableApps,
-                            onSelected: (value) {
-                              model.toggleUpdatableApps(true);
-                            },
-                          ),
-                          const SizedBox(width: 10),
                           DashboardChip(
                             label: I18nText('homeView.installed'),
                             isSelected: !model.showUpdatableApps,
                             onSelected: (value) {
                               model.toggleUpdatableApps(false);
                             },
+                          ),
+                          const SizedBox(width: 10),
+                          DashboardChip(
+                            label: I18nText('homeView.updatesAvailable'),
+                            isSelected: model.showUpdatableApps,
+                            onSelected: (value) {
+                              model.toggleUpdatableApps(true);
+                            },
                           )
                         ],
                       ),

lib/ui/views/home/home_viewmodel.dart

@@ -29,7 +29,7 @@ class HomeViewModel extends BaseViewModel {
   final Toast _toast = locator<Toast>();
   final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
   DateTime? _lastUpdate;
-  bool showUpdatableApps = true;
+  bool showUpdatableApps = false;
   List<PatchedApplication> patchedInstalledApps = [];
   List<PatchedApplication> patchedUpdatableApps = [];
 
@@ -143,6 +143,10 @@ class HomeViewModel extends BaseViewModel {
     }
   }
 
+  void updatesAreDisabled() {
+    _toast.show('homeView.updatesDisabled');
+  }
+
   Future<void> showUpdateConfirmationDialog(BuildContext parentContext) async {
     return showDialog(
       context: parentContext,

lib/ui/views/installer/installer_viewmodel.dart

@@ -219,9 +219,7 @@ class InstallerViewModel extends BaseViewModel {
 
   void shareResult() {
     try {
-      if (isInstalled) {
+      _patcherAPI.sharePatchedFile(_app.name, _app.version);
-        _patcherAPI.sharePatchedFile(_app.name, _app.version);
-      }
     } on Exception catch (e, s) {
       Sentry.captureException(e, stackTrace: s);
     }

lib/ui/views/settings/settings_view.dart

@@ -187,46 +187,28 @@ class SettingsView extends StatelessWidget {
                     ],
                   ),
                   _settingsDivider,
-                  SettingsSection(
+                  // SettingsSection(
-                    title: 'settingsView.logsSectionTitle',
+                  //   title: 'settingsView.logsSectionTitle',
-                    children: <Widget>[
+                  //   children: <Widget>[
-                      CustomSwitchTile(
+                  //     CustomSwitchTile(
-                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                  //       padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: I18nText(
+                  //       title: I18nText(
-                          'settingsView.sentryLabel',
+                  //         'settingsView.sentryLabel',
-                          child: const Text(
+                  //         child: const Text(
-                            '',
+                  //           '',
-                            style: TextStyle(
+                  //           style: TextStyle(
-                              fontSize: 20,
+                  //             fontSize: 20,
-                              fontWeight: FontWeight.w500,
+                  //             fontWeight: FontWeight.w500,
-                            ),
+                  //           ),
-                          ),
+                  //         ),
-                        ),
+                  //       ),
-                        subtitle: I18nText('settingsView.sentryHint'),
+                  //       subtitle: I18nText('settingsView.sentryHint'),
-                        value: model.isSentryEnabled(),
+                  //       value: model.isSentryEnabled(),
-                        onTap: (value) => model.useSentry(value),
+                  //       onTap: (value) => model.useSentry(value),
-                      ),
+                  //     ),
-                      const SizedBox(height: 20.0),
+                  //   ],
-                      CustomSwitchTile(
+                  // ),
-                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                  // _settingsDivider,
-                        title: I18nText(
-                          'settingsView.firebaseCrashlyticsLabel',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                        subtitle:
-                            I18nText('settingsView.firebaseCrashlyticsHint'),
-                        value: model.isCrashlyticsEnabled(),
-                        onTap: (value) => model.useCrashlytics(value),
-                      ),
-                    ],
-                  ),
-                  _settingsDivider,
                   SettingsSection(
                     title: 'settingsView.infoSectionTitle',
                     children: <Widget>[

lib/ui/views/settings/settings_viewmodel.dart

@@ -315,27 +315,15 @@ class SettingsViewModel extends BaseViewModel {
     );
   }
 
-  // disable sentry using switch boolean
+  // bool isSentryEnabled() {
+  //   return _managerAPI.isSentryEnabled();
+  // }
 
-  bool isSentryEnabled() {
+  // void useSentry(bool value) {
-    return _managerAPI.isSentryEnabled();
+  //   _managerAPI.setSentryStatus(value);
-  }
+  //   _toast.showBottom('settingsView.restartAppForChanges');
-
+  //   notifyListeners();
-  void useSentry(bool value) {
+  // }
-    _managerAPI.setSentryStatus(value);
-    _toast.showBottom('settingsView.restartAppForChanges');
-    notifyListeners();
-  }
-
-  bool isCrashlyticsEnabled() {
-    return _managerAPI.isCrashlyticsEnabled();
-  }
-
-  void useCrashlytics(bool value) {
-    _managerAPI.setCrashlyticsStatus(value);
-    _toast.showBottom('settingsView.restartAppForChanges');
-    notifyListeners();
-  }
 
   void deleteKeystore() {
     _managerAPI.deleteKeystore();

lib/ui/widgets/homeView/available_updates_card.dart

@@ -14,50 +14,74 @@ class AvailableUpdatesCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return apps.isEmpty
+    return CustomCard(
-        ? CustomCard(
+      child: Center(
-            child: Center(
+        child: Column(
-              child: Column(
+          children: <Widget>[
-                children: <Widget>[
+            Icon(
-                  Icon(
+              size: 40,
-                    size: 40,
+              Icons.update_disabled,
-                    Icons.update_disabled,
+              color: Theme.of(context).colorScheme.secondary,
-                    color: Theme.of(context).colorScheme.secondary,
-                  ),
-                  const SizedBox(height: 16),
-                  I18nText(
-                    'homeView.noUpdates',
-                    child: Text(
-                      '',
-                      textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.subtitle1!.copyWith(
-                            color: Theme.of(context).colorScheme.secondary,
-                          ),
-                    ),
-                  )
-                ],
-              ),
             ),
-          )
+            const SizedBox(height: 16),
-        : ListView(
+            I18nText(
-            shrinkWrap: true,
+              'homeView.WIP',
-            padding: EdgeInsets.zero,
+              child: Text(
-            physics: const NeverScrollableScrollPhysics(),
+                '',
-            children: apps
+                textAlign: TextAlign.center,
-                .map((app) => ApplicationItem(
+                style: Theme.of(context).textTheme.subtitle1!.copyWith(
-                    icon: app.icon,
+                      color: Theme.of(context).colorScheme.secondary,
-                    name: app.name,
+                    ),
-                    patchDate: app.patchDate,
+              ),
-                    changelog: app.changelog,
+            )
-                    isUpdatableApp: true,
+          ],
-                    //TODO: Find a better way to do update functionality
+        ),
-                    onPressed: () {}
+      ),
-                    // () =>
+    );
-                    //     locator<HomeViewModel>().navigateToPatcher(
+    // return apps.isEmpty
-                    //   app,
+    //     ? CustomCard(
-                    // ),
+    //         child: Center(
-                    ))
+    //           child: Column(
-                .toList(),
+    //             children: <Widget>[
-          );
+    //               Icon(
+    //                 size: 40,
+    //                 Icons.update_disabled,
+    //                 color: Theme.of(context).colorScheme.secondary,
+    //               ),
+    //               const SizedBox(height: 16),
+    //               I18nText(
+    //                 'homeView.noUpdates',
+    //                 child: Text(
+    //                   '',
+    //                   textAlign: TextAlign.center,
+    //                   style: Theme.of(context).textTheme.subtitle1!.copyWith(
+    //                         color: Theme.of(context).colorScheme.secondary,
+    //                       ),
+    //                 ),
+    //               )
+    //             ],
+    //           ),
+    //         ),
+    //       )
+    //     : ListView(
+    //         shrinkWrap: true,
+    //         padding: EdgeInsets.zero,
+    //         physics: const NeverScrollableScrollPhysics(),
+    //         children: apps
+    //             .map((app) => ApplicationItem(
+    //                 icon: app.icon,
+    //                 name: app.name,
+    //                 patchDate: app.patchDate,
+    //                 changelog: app.changelog,
+    //                 isUpdatableApp: true,
+    //                 //TODO: Find a better way to do update functionality
+    //                 onPressed: () {}
+    //                 // () =>
+    //                 //     locator<HomeViewModel>().navigateToPatcher(
+    //                 //   app,
+    //                 // ),
+    //                 ))
+    //             .toList(),
+    //       );
   }
 }

lib/ui/widgets/shared/application_item.dart

@@ -110,7 +110,7 @@ class _ApplicationItemState extends State<ApplicationItem>
                   children: <Widget>[
                     CustomMaterialButton(
                       label: widget.isUpdatableApp
-                          ? I18nText('applicationItem.infoButton')
+                          ? I18nText('applicationItem.patchButton')
                           : I18nText('applicationItem.infoButton'),
                       onPressed: widget.onPressed,
                     ),

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 0.0.33+33
+version: 0.0.34+34
 
 environment:
   sdk: ">=2.17.5 <3.0.0"
@@ -73,8 +73,6 @@ dependencies:
   url_launcher: ^6.1.5
   wakelock: ^0.6.2
   sentry_dio: ^6.12.2
-  firebase_core: ^1.24.0
-  firebase_crashlytics: ^2.9.0
   flutter_dotenv: ^5.0.2
 
 dev_dependencies:
@@ -92,3 +90,4 @@ flutter:
   uses-material-design: true
   assets:
     - assets/i18n/
+    - .env