Merge remote-tracking branch 'origin/develop' into develop

assets/ca/lets-encrypt-r13.pem

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFBTCCAu2gAwIBAgIQWgDyEtjUtIDzkkFX6imDBTANBgkqhkiG9w0BAQsFADBP
+MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy
+Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNDAzMTMwMDAwMDBa
+Fw0yNzAzMTIyMzU5NTlaMDMxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBF
+bmNyeXB0MQwwCgYDVQQDEwNSMTMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQClZ3CN0FaBZBUXYc25BtStGZCMJlA3mBZjklTb2cyEBZPs0+wIG6BgUUNI
+fSvHSJaetC3ancgnO1ehn6vw1g7UDjDKb5ux0daknTI+WE41b0VYaHEX/D7YXYKg
+L7JRbLAaXbhZzjVlyIuhrxA3/+OcXcJJFzT/jCuLjfC8cSyTDB0FxLrHzarJXnzR
+yQH3nAP2/Apd9Np75tt2QnDr9E0i2gB3b9bJXxf92nUupVcM9upctuBzpWjPoXTi
+dYJ+EJ/B9aLrAek4sQpEzNPCifVJNYIKNLMc6YjCR06CDgo28EdPivEpBHXazeGa
+XP9enZiVuppD0EqiFwUBBDDTMrOPAgMBAAGjgfgwgfUwDgYDVR0PAQH/BAQDAgGG
+MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATASBgNVHRMBAf8ECDAGAQH/
+AgEAMB0GA1UdDgQWBBTnq58PLDOgU9NeT3jIsoQOO9aSMzAfBgNVHSMEGDAWgBR5
+tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAKG
+Fmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0gBAwwCjAIBgZngQwBAgEwJwYD
+VR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVuY3Iub3JnLzANBgkqhkiG9w0B
+AQsFAAOCAgEAUTdYUqEimzW7TbrOypLqCfL7VOwYf/Q79OH5cHLCZeggfQhDconl
+k7Kgh8b0vi+/XuWu7CN8n/UPeg1vo3G+taXirrytthQinAHGwc/UdbOygJa9zuBc
+VyqoH3CXTXDInT+8a+c3aEVMJ2St+pSn4ed+WkDp8ijsijvEyFwE47hulW0Ltzjg
+9fOV5Pmrg/zxWbRuL+k0DBDHEJennCsAen7c35Pmx7jpmJ/HtgRhcnz0yjSBvyIw
+6L1QIupkCv2SBODT/xDD3gfQQyKv6roV4G2EhfEyAsWpmojxjCUCGiyg97FvDtm/
+NK2LSc9lybKxB73I2+P2G3CaWpvvpAiHCVu30jW8GCxKdfhsXtnIy2imskQqVZ2m
+0Pmxobb28Tucr7xBK7CtwvPrb79os7u2XP3O5f9b/H66GNyRrglRXlrYjI1oGYL/
+f4I1n/Sgusda6WvA6C190kxjU15Y12mHU4+BxyR9cx2hhGS9fAjMZKJss28qxvz6
+Axu4CaDmRNZpK/pQrXF17yXCXkmEWgvSOEZy6Z9pcbLIVEGckV/iVeq0AOo2pkg9
+p4QRIy0tK2diRENLSF2KysFwbY6B26BFeFs3v1sYVRhFW9nLkOrQVporCS0KyZmf
+wVD89qSTlnctLcZnIavjKsKUu1nA1iU0yYMdYepKR7lWbnwhdx3ewok=
+-----END CERTIFICATE-----

lib/api/marianumcloud/talk/getPoll/getPollState.dart

@@ -1,18 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-
-import '../talkApi.dart';
-import 'getPollStateResponse.dart';
-
-class GetPollState extends TalkApi<GetPollStateResponse> {
-  String token;
-  int pollId;
-  GetPollState({required this.token, required this.pollId}) : super('v1/poll/$token/$pollId', null);
-
-  @override
-  GetPollStateResponse assemble(String raw) => GetPollStateResponse.fromJson(jsonDecode(raw)['ocs']);
-
-  @override
-  Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.get(uri, headers: headers);
-}

lib/api/marianumcloud/talk/getPoll/getPollStateResponse.dart

@@ -1,50 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-import '../../../apiResponse.dart';
-
-part 'getPollStateResponse.g.dart';
-
-@JsonSerializable(explicitToJson: true)
-class GetPollStateResponse extends ApiResponse {
-  GetPollStateResponseObject data;
-
-  GetPollStateResponse(this.data);
-
-  factory GetPollStateResponse.fromJson(Map<String, dynamic> json) => _$GetPollStateResponseFromJson(json);
-  Map<String, dynamic> toJson() => _$GetPollStateResponseToJson(this);
-}
-
-@JsonSerializable(explicitToJson: true)
-class GetPollStateResponseObject {
-  int id;
-  String question;
-  List<String> options;
-  dynamic votes;
-  String actorType;
-  String actorId;
-  String actorDisplayName;
-  int status;
-  int resultMode;
-  int maxVotes;
-  List<int> votedSelf;
-  int? numVoters;
-  List<String>? details;
-
-  GetPollStateResponseObject(
-      this.id,
-      this.question,
-      this.options,
-      this.votes,
-      this.actorType,
-      this.actorId,
-      this.actorDisplayName,
-      this.status,
-      this.resultMode,
-      this.maxVotes,
-      this.votedSelf,
-      this.numVoters,
-      this.details);
-
-  factory GetPollStateResponseObject.fromJson(Map<String, dynamic> json) => _$GetPollStateResponseObjectFromJson(json);
-  Map<String, dynamic> toJson() => _$GetPollStateResponseObjectToJson(this);
-}

lib/api/marianumcloud/talk/getPoll/getPollStateResponse.g.dart

@@ -1,60 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'getPollStateResponse.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-GetPollStateResponse _$GetPollStateResponseFromJson(
-        Map<String, dynamic> json) =>
-    GetPollStateResponse(
-      GetPollStateResponseObject.fromJson(json['data'] as Map<String, dynamic>),
-    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as String),
-      );
-
-Map<String, dynamic> _$GetPollStateResponseToJson(
-        GetPollStateResponse instance) =>
-    <String, dynamic>{
-      if (instance.headers case final value?) 'headers': value,
-      'data': instance.data.toJson(),
-    };
-
-GetPollStateResponseObject _$GetPollStateResponseObjectFromJson(
-        Map<String, dynamic> json) =>
-    GetPollStateResponseObject(
-      (json['id'] as num).toInt(),
-      json['question'] as String,
-      (json['options'] as List<dynamic>).map((e) => e as String).toList(),
-      json['votes'],
-      json['actorType'] as String,
-      json['actorId'] as String,
-      json['actorDisplayName'] as String,
-      (json['status'] as num).toInt(),
-      (json['resultMode'] as num).toInt(),
-      (json['maxVotes'] as num).toInt(),
-      (json['votedSelf'] as List<dynamic>)
-          .map((e) => (e as num).toInt())
-          .toList(),
-      (json['numVoters'] as num?)?.toInt(),
-      (json['details'] as List<dynamic>?)?.map((e) => e as String).toList(),
-    );
-
-Map<String, dynamic> _$GetPollStateResponseObjectToJson(
-        GetPollStateResponseObject instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'question': instance.question,
-      'options': instance.options,
-      'votes': instance.votes,
-      'actorType': instance.actorType,
-      'actorId': instance.actorId,
-      'actorDisplayName': instance.actorDisplayName,
-      'status': instance.status,
-      'resultMode': instance.resultMode,
-      'maxVotes': instance.maxVotes,
-      'votedSelf': instance.votedSelf,
-      'numVoters': instance.numVoters,
-      'details': instance.details,
-    };

lib/api/marianumcloud/talk/votePoll/votePoll.dart

@@ -1,30 +0,0 @@
-import 'dart:convert';
-import 'dart:developer';
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../getPoll/getPollStateResponse.dart';
-import '../talkApi.dart';
-import 'votePollParams.dart';
-
-class VotePoll extends TalkApi {
-  String token;
-  int pollId;
-  VotePoll({required this.token, required this.pollId, required VotePollParams params}) : super('v1/poll/$token/$pollId', params);
-
-  @override
-  GetPollStateResponse assemble(String raw) {
-    log(raw);
-    return GetPollStateResponse.fromJson(jsonDecode(raw)['ocs']);
-  }
-
-  @override
-  Future<Response>? request(Uri uri, Object? body, Map<String, String>? headers) {
-    if(body is VotePollParams) {
-      log(body.toJson().toString());
-      return http.post(uri, headers: headers, body: body.toJson().toString());
-    }
-    return null;
-  }
-}

lib/api/marianumcloud/talk/votePoll/votePollParams.dart

@@ -1,14 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-import '../../../apiParams.dart';
-
-part 'votePollParams.g.dart';
-
-@JsonSerializable()
-class VotePollParams extends ApiParams {
-  List<int> optionIds;
-
-  VotePollParams({required this.optionIds});
-  factory VotePollParams.fromJson(Map<String, dynamic> json) => _$VotePollParamsFromJson(json);
-  Map<String, dynamic> toJson() => _$VotePollParamsToJson(this);
-}

lib/api/marianumcloud/talk/votePoll/votePollParams.g.dart

@@ -1,19 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'votePollParams.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-VotePollParams _$VotePollParamsFromJson(Map<String, dynamic> json) =>
-    VotePollParams(
-      optionIds: (json['optionIds'] as List<dynamic>)
-          .map((e) => (e as num).toInt())
-          .toList(),
-    );
-
-Map<String, dynamic> _$VotePollParamsToJson(VotePollParams instance) =>
-    <String, dynamic>{
-      'optionIds': instance.optionIds,
-    };

lib/main.dart

@@ -46,6 +46,7 @@ Future<void> main() async {
 
     PlatformAssetBundle().load('assets/ca/lets-encrypt-r3.pem').then(addCertificateAsTrusted),
     PlatformAssetBundle().load('assets/ca/lets-encrypt-r10.pem').then(addCertificateAsTrusted),
+    PlatformAssetBundle().load('assets/ca/lets-encrypt-r13.pem').then(addCertificateAsTrusted),
 
     Future(() async {
       await HydratedStorage.build(

lib/model/endpointData.dart

@@ -41,7 +41,7 @@ class EndpointData {
 
   Endpoint webuntis() => EndpointOptions(
       live: Endpoint(
-        domain: 'peleus.webuntis.com',
+        domain: 'marianum-fulda.webuntis.com',
       ),
       staged: Endpoint(
         domain: 'mhsl.eu',

lib/view/pages/talk/components/chatBubble.dart

@@ -6,9 +6,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:jiffy/jiffy.dart';
 import 'package:open_filex/open_filex.dart';
-import '../../../../api/marianumcloud/talk/getPoll/getPollState.dart';
-import '../../../../api/marianumcloud/talk/votePoll/votePoll.dart';
-import '../../../../api/marianumcloud/talk/votePoll/votePollParams.dart';
 import '../../../../extensions/text.dart';
 import 'package:provider/provider.dart';
 
@@ -21,13 +18,11 @@ import '../../../../api/marianumcloud/talk/reactMessage/reactMessageParams.dart'
 import '../../../../api/marianumcloud/talk/room/getRoomResponse.dart';
 import '../../../../model/chatList/chatProps.dart';
 import '../../../../widget/debug/debugTile.dart';
-import '../../../../widget/loadingSpinner.dart';
 import '../../files/fileElement.dart';
 import 'answerReference.dart';
 import 'chatBubbleStyles.dart';
 import 'chatMessage.dart';
 import '../messageReactions.dart';
-import 'pollOptionsList.dart';
 
 class ChatBubble extends StatefulWidget {
   final BuildContext context;
@@ -302,42 +297,6 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
           onLongPress: showOptionsDialog,
           onDoubleTap: showOptionsDialog,
           onTap: () {
-            if(message.originalData?['object']?.type == RichObjectStringObjectType.talkPoll) {
-              var pollId = int.parse(message.originalData!['object']!.id);
-              var pollState = GetPollState(token: widget.bubbleData.token, pollId: pollId).run();
-              List<int>? ownVotes;
-              showDialog(context: context, builder: (context) => AlertDialog(
-                title: Text(message.originalData!['object']!.name, textScaler: TextScaler.linear(0.9)),
-                content: FutureBuilder(
-                    future: pollState,
-                    builder: (context, snapshot) {
-                      if(snapshot.connectionState == ConnectionState.waiting) return const LoadingSpinner();
-
-                      var pollData = snapshot.data!.data;
-                      ownVotes = pollData.votedSelf;
-                      return PollOptionsList(
-                        pollData: pollData,
-                        callback: (votes) => ownVotes = votes
-                      );
-                    }
-                ),
-                actions: [
-                  TextButton(
-                      onPressed: () async {
-                        Navigator.of(context).pop();
-                        if(ownVotes == null) return;
-                        VotePoll(pollId: pollId, token: widget.bubbleData.token, params: VotePollParams(optionIds: ownVotes!)).run();
-                      },
-                      child: const Text('Stimme abgeben')
-                  ),
-                  TextButton(
-                    onPressed: () => Navigator.of(context).pop(),
-                    child: const Text('Abbrechen')
-                  ),
-                ],
-              ));
-            }
-
             if(message.file == null) return;
 
             if(downloadProgress > 0) {

lib/view/pages/talk/components/chatMessage.dart

@@ -32,14 +32,6 @@ class ChatMessage {
       onOpen: onOpen,
     );
 
-    if(originalData?['object']?.type == RichObjectStringObjectType.talkPoll) {
-      return ListTile(
-        leading: const Icon(Icons.poll_outlined),
-        title: Text(originalData!['object']!.name),
-        contentPadding: const EdgeInsets.only(left: 10),
-      );
-    }
-
     if(file == null) return contentWidget;
 
     return Padding(

lib/view/pages/talk/components/pollOptionsList.dart

@@ -1,47 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-
-import '../../../../api/marianumcloud/talk/getPoll/getPollStateResponse.dart';
-
-class PollOptionsList extends StatefulWidget {
-  final GetPollStateResponseObject pollData;
-  final Function(List<int>) callback;
-  const PollOptionsList({super.key, required this.pollData, required this.callback});
-
-  @override
-  State<PollOptionsList> createState() => _PollOptionsListState();
-}
-
-class _PollOptionsListState extends State<PollOptionsList> {
-  late List<int> ownVotes;
-
-  @override
-  void initState() {
-    super.initState();
-    ownVotes = widget.pollData.votedSelf;
-  }
-
-  @override
-  Widget build(BuildContext context) => ListView(
-      shrinkWrap: true,
-      children: [
-        ...widget.pollData.options.map<Widget>(
-            (option) => CheckboxListTile(
-            value: ownVotes.contains(widget.pollData.options.indexOf(option)),
-            title: Text(option),
-            onChanged: (value) {
-              var optionId = widget.pollData.options.indexOf(option);
-              setState(() {
-                if(ownVotes.contains(optionId)) {
-                  ownVotes.remove(optionId);
-                } else {
-                  ownVotes.add(optionId);
-                }
-              });
-              widget.callback(ownVotes);
-            }
-          )
-        )
-      ],
-    );
-}