From ffba202e4880c2f1f93fe29467a62071e93a5c88 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Tue, 30 Nov 2021 22:51:11 +0000 Subject: [PATCH] Add Mightier Amp metadata --- metadata/com.tuntori.mightieramp.yml | 34 ++++ .../remove_internet_permission.diff | 13 ++ .../remove_youtube_sentry_support.diff | 192 ++++++++++++++++++ 3 files changed, 239 insertions(+) create mode 100644 metadata/com.tuntori.mightieramp.yml create mode 100644 metadata/com.tuntori.mightieramp/remove_internet_permission.diff create mode 100644 metadata/com.tuntori.mightieramp/remove_youtube_sentry_support.diff diff --git a/metadata/com.tuntori.mightieramp.yml b/metadata/com.tuntori.mightieramp.yml new file mode 100644 index 0000000000..f5acf80bcc --- /dev/null +++ b/metadata/com.tuntori.mightieramp.yml @@ -0,0 +1,34 @@ +Categories: + - Multimedia +License: MIT +AuthorName: Diyan Iliev +SourceCode: https://github.com/tuntorius/mightier_amp +IssueTracker: https://github.com/tuntorius/mightier_amp/issues +Donate: https://www.paypal.com/donate?hosted_button_id=FZWWAM4NUFRPC + +AutoName: Mightier Amp + +RepoType: git +Repo: https://github.com/tuntorius/mightier_amp.git + +Builds: + - versionName: 0.9.0 + versionCode: 16 + commit: d5f3db043ad46e2e8fdd2fa08db692b8f322192f + patch: + - remove_youtube_sentry_support.diff + - remove_internet_permission.diff + output: build/app/outputs/flutter-apk/app-release.apk + srclibs: + - flutter@2.5.3 + rm: + - ios + build: + - $$flutter$$/bin/flutter config --no-analytics + - $$flutter$$/bin/flutter build apk --release + +AutoUpdateMode: Version +UpdateCheckMode: Tags +UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+ +CurrentVersion: 0.9.0 +CurrentVersionCode: 16 diff --git a/metadata/com.tuntori.mightieramp/remove_internet_permission.diff b/metadata/com.tuntori.mightieramp/remove_internet_permission.diff new file mode 100644 index 0000000000..a7ab6a98e5 --- /dev/null +++ b/metadata/com.tuntori.mightieramp/remove_internet_permission.diff @@ -0,0 +1,13 @@ +diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml +index 3bf6cae..db8a638 100644 +--- a/android/app/src/main/AndroidManifest.xml ++++ b/android/app/src/main/AndroidManifest.xml +@@ -8,8 +8,6 @@ + + + +- +- + + + }); + } + +- void addFromYoutubeSource(BuildContext context) { +- Navigator.of(context) +- .push(MaterialPageRoute( +- builder: (context) => OnlineSearchScreen(source: YoutubeSource()))) +- .then((value) { +- if (value is List) { +- for (int i = 0; i < value.length; i++) { +- var name = "${value[i].artist} - ${value[i].title}"; +- TrackData().addTrack(value[i].url, name); +- } +- //clear filter and scroll to bottom +- searchCtrl.text = ""; +- setState(() {}); +- _scollToNewSongs(); +- } +- }); +- } +- + void _scollToNewSongs() async { + await Future.delayed(Duration(milliseconds: 300)); + scrollController.animateTo(scrollController.position.maxScrollExtent, +@@ -426,18 +407,6 @@ class _TracksPageState extends State + // Menu items + items: [ + // Floating action menu item +- if (kDebugMode) +- Bubble( +- title: "Youtube", +- iconColor: Colors.white, +- bubbleColor: Colors.red, +- icon: Icons.ondemand_video_outlined, +- titleStyle: TextStyle( +- fontSize: 16, color: Colors.white), +- onPress: () { +- _animationController.reverse(); +- addFromYoutubeSource(context); +- }), + if (kDebugMode) + Bubble( + title: "Online Source", +diff --git a/lib/bluetooth/NuxDeviceControl.dart b/lib/bluetooth/NuxDeviceControl.dart +index b4d1f0c..c8cd568 100644 +--- a/lib/bluetooth/NuxDeviceControl.dart ++++ b/lib/bluetooth/NuxDeviceControl.dart +@@ -8,7 +8,6 @@ import 'package:flutter/material.dart'; + import 'package:flutter_blue/flutter_blue.dart'; + import 'package:mighty_plug_manager/bluetooth/devices/NuxMighty8BT.dart'; + import 'package:mighty_plug_manager/platform/simpleSharedPrefs.dart'; +-import 'package:sentry_flutter/sentry_flutter.dart'; + import 'package:undo/undo.dart'; + + import 'bleMidiHandler.dart'; +@@ -628,12 +627,6 @@ class NuxDeviceControl extends ChangeNotifier { + + diagData.device = "${_device.productName} ${_device.productVersion}"; + if (connected != null) diagData.connected = connected; +- +- Sentry.configureScope((scope) { +- scope.setTag( +- "nuxDevice", "${_device.productName} ${_device.productVersion}"); +- scope.setContexts('NUX', diagData.toMap(includeJsonPreset)); +- }); + } + + NuxDevice get device => _device; +diff --git a/lib/main.dart b/lib/main.dart +index adcfaa7..9570ef8 100644 +--- a/lib/main.dart ++++ b/lib/main.dart +@@ -11,7 +11,6 @@ import 'package:mighty_plug_manager/bluetooth/devices/presets/presetsStorage.dar + import 'package:mighty_plug_manager/midi/MidiControllerManager.dart'; + import 'package:mighty_plug_manager/platform/simpleSharedPrefs.dart'; + import 'package:permission_handler/permission_handler.dart'; +-import 'package:sentry_flutter/sentry_flutter.dart'; + import 'UI/popups/alertDialogs.dart'; + import 'UI/widgets/NuxAppBar.dart' as NuxAppBar; + import 'UI/widgets/nestedWillPopScope.dart'; +@@ -30,7 +29,6 @@ import 'UI/pages/jamTracks.dart'; + import 'UI/pages/settings.dart'; + + //recreate this file with your own api keys +-import 'configKeys.dart'; + + //able to create snackbars/messages everywhere + final navigatorKey = GlobalKey(); +@@ -49,53 +47,9 @@ void main() { + WidgetsFlutterBinding.ensureInitialized(); + SharedPrefs prefs = SharedPrefs(); + +- //capture flutter errors +- if (!kDebugMode) +- FlutterError.onError = (FlutterErrorDetails details) { +- print(""); +- DebugConsole.print("Flutter error: ${details.toString()}"); +- +- //update diagnostics with json preset +- NuxDeviceControl().updateDiagnosticsData(includeJsonPreset: true); +- +- // Send report +- Sentry.captureException( +- details, +- stackTrace: details.stack, +- ); +- }; +- +- if (!kDebugMode) { +- runZonedGuarded(() { +- prefs.waitLoading().then((value) async { +- if (!kDebugMode) { +- await SentryFlutter.init((options) { +- options.dsn = sentryDsn; +- }); +- } +- mainRunApp(); +- }); +- }, (Object error, StackTrace stackTrace) async { +- // Whenever an error occurs, call the `_reportError` function. This sends +- // Dart errors to the dev console or Sentry depending on the environment. +- //_reportError(error, stackTrace); +- +- DebugConsole.print("Dart error: ${error.toString()}"); +- DebugConsole.print(stackTrace); +- +- //update diagnostics with json preset +- NuxDeviceControl().updateDiagnosticsData(includeJsonPreset: true); +- +- await Sentry.captureException( +- error, +- stackTrace: stackTrace, +- ); +- }); +- } else { + prefs.waitLoading().then((value) { + mainRunApp(); + }); +- } + } + + mainRunApp() { +diff --git a/pubspec.lock b/pubspec.lock +index b29468b..63c54c7 100644 +--- a/pubspec.lock ++++ b/pubspec.lock +@@ -506,20 +506,6 @@ packages: + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.3" +- sentry: +- dependency: transitive +- description: +- name: sentry +- url: "https://pub.dartlang.org" +- source: hosted +- version: "6.0.0" +- sentry_flutter: +- dependency: "direct main" +- description: +- name: sentry_flutter +- url: "https://pub.dartlang.org" +- source: hosted +- version: "6.0.1" + share_plus: + dependency: "direct main" + description: +diff --git a/pubspec.yaml b/pubspec.yaml +index 3c014fd..55c5abd 100644 +--- a/pubspec.yaml ++++ b/pubspec.yaml +@@ -55,7 +55,6 @@ dependencies: + page_view_indicators: ^2.0.0 + uuid: ^3.0.1 + marquee_text: ^2.0.0 +- sentry_flutter: ^6.0.1 + + #some fixes added to flutter_blue library, + flutter_blue: