Compare commits
91 Commits
feature-hi
...
fe93a94fc6
Author | SHA1 | Date | |
---|---|---|---|
fe93a94fc6 | |||
a33c4ddac5 | |||
634fe41e78 | |||
328c4f410c | |||
43471fcf3d | |||
e78e2b8cd4 | |||
a57f42d4ed | |||
8ff993bf19 | |||
8968e53e5c | |||
430f2fe603 | |||
d00592c3e7 | |||
3fb48b5bcf | |||
69fc98ad45 | |||
76a1f65083 | |||
ed35e91d59 | |||
ebbb70dc96 | |||
3281b134e0 | |||
2056be23cd | |||
e57a1a915e | |||
181682a424 | |||
9fa711e460 | |||
1f30e2d97f | |||
0f84257eba | |||
b171fef348 | |||
81f5b662b7 | |||
7a393bf630 | |||
fc72391a75 | |||
6ad8203b6a | |||
f58a2ec8cd | |||
91ef689d2a | |||
ee6af2bc07 | |||
2db3b29359 | |||
107a5bdbf8 | |||
3802e4a5b9 | |||
04e8ce9c0a | |||
450c26b187 | |||
7129c0dee8 | |||
ae6b6511d7 | |||
232a767312 | |||
f5407d2477 | |||
19aca8f97f | |||
c4a7533315 | |||
d067ee702a | |||
dfd9459922 | |||
51373fe7a2 | |||
cafa1248d5 | |||
ed710b3c2e | |||
8dd3ca9eae | |||
07ffa374fe | |||
0302c10fcd | |||
92361ec455 | |||
cf4dea566e | |||
d8c72a5d28 | |||
9803b06af1 | |||
8131ccae1e | |||
e901f139d6 | |||
02dd659d1d | |||
277b3366f9 | |||
b4defb9eda | |||
4c7f53e309 | |||
27618f4404 | |||
8bf5e5a06a | |||
bc60362984 | |||
74c7c16877 | |||
0a577b5f48 | |||
57ddee2dc9 | |||
8ae8c97b41 | |||
883db8d7ef | |||
6450b292a7 | |||
65d15ffd4e | |||
07401d0864 | |||
21411e1517 | |||
339d402422 | |||
c54a42aa43 | |||
42574583ed | |||
9aa3f7c058 | |||
1b407562df | |||
f86c97dcf0 | |||
6b4d6a1c8c | |||
20dfe2c2e6 | |||
6c2c305f1c | |||
dbbf6f6c5c | |||
07b32f1e32 | |||
ea329d8d64 | |||
f45848331e | |||
a1ad6aa582 | |||
3e3e2579f0 | |||
681b5e42c3 | |||
a0c025b58b | |||
20d7b16ede | |||
afdc02f2a4 |
@@ -9,6 +9,10 @@
|
|||||||
# packages, and plugins designed to encourage good coding practices.
|
# packages, and plugins designed to encourage good coding practices.
|
||||||
include: package:flutter_lints/flutter.yaml
|
include: package:flutter_lints/flutter.yaml
|
||||||
|
|
||||||
|
analyzer:
|
||||||
|
errors:
|
||||||
|
invalid_annotation_target: ignore
|
||||||
|
|
||||||
linter:
|
linter:
|
||||||
# The lint rules applied to this project can be customized in the
|
# The lint rules applied to this project can be customized in the
|
||||||
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
|
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
|
||||||
@@ -28,6 +32,13 @@ linter:
|
|||||||
prefer_relative_imports: true
|
prefer_relative_imports: true
|
||||||
unnecessary_lambdas: true
|
unnecessary_lambdas: true
|
||||||
prefer_single_quotes: true
|
prefer_single_quotes: true
|
||||||
|
prefer_if_elements_to_conditional_expressions: true
|
||||||
|
prefer_expression_function_bodies: true
|
||||||
|
omit_local_variable_types: true
|
||||||
|
eol_at_end_of_file: true
|
||||||
|
cast_nullable_to_non_nullable: true
|
||||||
|
avoid_void_async: true
|
||||||
|
avoid_multiple_declarations_per_line: true
|
||||||
|
|
||||||
# Additional information about this file can be found at
|
# Additional information about this file can be found at
|
||||||
# https://dart.dev/guides/language/analysis-options
|
# https://dart.dev/guides/language/analysis-options
|
||||||
|
@@ -45,7 +45,7 @@ android {
|
|||||||
applicationId "eu.mhsl.marianum.mobile.client"
|
applicationId "eu.mhsl.marianum.mobile.client"
|
||||||
// You can update the following values to match your application needs.
|
// You can update the following values to match your application needs.
|
||||||
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
|
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
|
||||||
minSdkVersion 19
|
minSdkVersion 21
|
||||||
targetSdkVersion flutter.targetSdkVersion
|
targetSdkVersion flutter.targetSdkVersion
|
||||||
versionCode flutterVersionCode.toInteger()
|
versionCode flutterVersionCode.toInteger()
|
||||||
versionName flutterVersionName
|
versionName flutterVersionName
|
||||||
|
@@ -20,7 +20,7 @@ pluginManagement {
|
|||||||
plugins {
|
plugins {
|
||||||
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
|
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
|
||||||
id "com.android.application" version "7.3.0" apply false
|
id "com.android.application" version "7.3.0" apply false
|
||||||
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
|
id "org.jetbrains.kotlin.android" version "1.8.10" apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
include ":app"
|
include ":app"
|
||||||
|
7
build.yaml
Normal file
7
build.yaml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
targets:
|
||||||
|
$default:
|
||||||
|
builders:
|
||||||
|
json_serializable:
|
||||||
|
options:
|
||||||
|
explicit_to_json: false
|
||||||
|
generic_argument_factories: true
|
@@ -4,7 +4,5 @@ class ApiError {
|
|||||||
ApiError(this.message);
|
ApiError(this.message);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String toString() {
|
String toString() => 'ApiError: $message';
|
||||||
return 'ApiError: $message';
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -1,3 +1,3 @@
|
|||||||
class ApiParams {
|
class ApiParams {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -2,4 +2,4 @@
|
|||||||
|
|
||||||
class ApiRequest {
|
class ApiRequest {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -6,4 +6,4 @@ abstract class ApiResponse {
|
|||||||
|
|
||||||
@JsonKey(includeIfNull: false)
|
@JsonKey(includeIfNull: false)
|
||||||
late Map<String, String>? headers;
|
late Map<String, String>? headers;
|
||||||
}
|
}
|
||||||
|
@@ -1,18 +1,16 @@
|
|||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
|
|
||||||
import 'getHolidaysResponse.dart';
|
import 'getHolidaysResponse.dart';
|
||||||
|
|
||||||
class GetHolidays {
|
class GetHolidays {
|
||||||
Future<GetHolidaysResponse> query() async {
|
Future<GetHolidaysResponse> query() async {
|
||||||
String response = (await http.get(Uri.parse('https://ferien-api.de/api/v1/holidays/HE'))).body;
|
var response = (await http.get(Uri.parse('https://ferien-api.de/api/v1/holidays/HE'))).body;
|
||||||
|
var data = jsonDecode(response) as List<dynamic>;
|
||||||
return GetHolidaysResponse(
|
return GetHolidaysResponse(
|
||||||
List<GetHolidaysResponseObject>.from(
|
List<GetHolidaysResponseObject>.from(
|
||||||
jsonDecode(response).map<GetHolidaysResponseObject>(
|
data.map<GetHolidaysResponseObject>((e) => GetHolidaysResponseObject.fromJson(e as Map<String, dynamic>))
|
||||||
GetHolidaysResponseObject.fromJson
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -6,24 +6,21 @@ import 'getHolidaysResponse.dart';
|
|||||||
|
|
||||||
class GetHolidaysCache extends RequestCache<GetHolidaysResponse> {
|
class GetHolidaysCache extends RequestCache<GetHolidaysResponse> {
|
||||||
GetHolidaysCache({onUpdate, renew}) : super(RequestCache.cacheDay, onUpdate, renew: renew) {
|
GetHolidaysCache({onUpdate, renew}) : super(RequestCache.cacheDay, onUpdate, renew: renew) {
|
||||||
start('MarianumMobile', 'state-holidays');
|
start('state-holidays');
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetHolidaysResponse onLocalData(String json) {
|
GetHolidaysResponse onLocalData(String json) {
|
||||||
List<dynamic> parsedListJson = jsonDecode(json)['data'];
|
List<dynamic> parsedListJson = jsonDecode(json)['data'];
|
||||||
return GetHolidaysResponse(
|
return GetHolidaysResponse(
|
||||||
List<GetHolidaysResponseObject>.from(
|
List<GetHolidaysResponseObject>.from(
|
||||||
parsedListJson.map<GetHolidaysResponseObject>(
|
parsedListJson.map<GetHolidaysResponseObject>(
|
||||||
// ignore: unnecessary_lambdas
|
(i) => GetHolidaysResponseObject.fromJson(i as Map<String, dynamic>)
|
||||||
(dynamic i) => GetHolidaysResponseObject.fromJson(i)
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetHolidaysResponse> onLoad() {
|
Future<GetHolidaysResponse> onLoad() => GetHolidays().query();
|
||||||
return GetHolidays().query();
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -35,4 +35,4 @@ class GetHolidaysResponseObject {
|
|||||||
|
|
||||||
factory GetHolidaysResponseObject.fromJson(Map<String, dynamic> json) => _$GetHolidaysResponseObjectFromJson(json);
|
factory GetHolidaysResponseObject.fromJson(Map<String, dynamic> json) => _$GetHolidaysResponseObjectFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$GetHolidaysResponseObjectToJson(this);
|
Map<String, dynamic> toJson() => _$GetHolidaysResponseObjectToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -2,7 +2,6 @@ import 'dart:convert';
|
|||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
import 'package:http/http.dart';
|
|
||||||
|
|
||||||
import '../../../model/accountData.dart';
|
import '../../../model/accountData.dart';
|
||||||
import '../../../model/endpointData.dart';
|
import '../../../model/endpointData.dart';
|
||||||
@@ -10,7 +9,7 @@ import 'autocompleteResponse.dart';
|
|||||||
|
|
||||||
class AutocompleteApi {
|
class AutocompleteApi {
|
||||||
Future<AutocompleteResponse> find(String query) async {
|
Future<AutocompleteResponse> find(String query) async {
|
||||||
Map<String, dynamic> getParameters = {
|
var getParameters = <String, dynamic>{
|
||||||
'search': query,
|
'search': query,
|
||||||
'itemType': ' ',
|
'itemType': ' ',
|
||||||
'itemId': ' ',
|
'itemId': ' ',
|
||||||
@@ -18,16 +17,16 @@ class AutocompleteApi {
|
|||||||
'limit': '10',
|
'limit': '10',
|
||||||
};
|
};
|
||||||
|
|
||||||
Map<String, String> headers = {};
|
var headers = <String, String>{};
|
||||||
headers.putIfAbsent('Accept', () => 'application/json');
|
headers.putIfAbsent('Accept', () => 'application/json');
|
||||||
headers.putIfAbsent('OCS-APIRequest', () => 'true');
|
headers.putIfAbsent('OCS-APIRequest', () => 'true');
|
||||||
|
|
||||||
Uri endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/core/autocomplete/get', getParameters);
|
var endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/core/autocomplete/get', getParameters);
|
||||||
|
|
||||||
Response response = await http.get(endpoint, headers: headers);
|
var response = await http.get(endpoint, headers: headers);
|
||||||
if(response.statusCode != HttpStatus.ok) throw Exception('Api call failed with ${response.statusCode}: ${response.body}');
|
if(response.statusCode != HttpStatus.ok) throw Exception('Api call failed with ${response.statusCode}: ${response.body}');
|
||||||
String result = response.body;
|
var result = response.body;
|
||||||
return AutocompleteResponse.fromJson(jsonDecode(result)['ocs']);
|
return AutocompleteResponse.fromJson(jsonDecode(result)['ocs']);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -27,4 +27,4 @@ class AutocompleteResponseObject {
|
|||||||
|
|
||||||
factory AutocompleteResponseObject.fromJson(Map<String, dynamic> json) => _$AutocompleteResponseObjectFromJson(json);
|
factory AutocompleteResponseObject.fromJson(Map<String, dynamic> json) => _$AutocompleteResponseObjectFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$AutocompleteResponseObjectToJson(this);
|
Map<String, dynamic> toJson() => _$AutocompleteResponseObjectToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -1,7 +1,6 @@
|
|||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
import 'package:http/http.dart';
|
|
||||||
|
|
||||||
import '../../../model/accountData.dart';
|
import '../../../model/accountData.dart';
|
||||||
import '../../../model/endpointData.dart';
|
import '../../../model/endpointData.dart';
|
||||||
@@ -9,15 +8,15 @@ import 'fileSharingApiParams.dart';
|
|||||||
|
|
||||||
class FileSharingApi {
|
class FileSharingApi {
|
||||||
Future<void> share(FileSharingApiParams query) async {
|
Future<void> share(FileSharingApiParams query) async {
|
||||||
Map<String, String> headers = {};
|
var headers = <String, String>{};
|
||||||
headers.putIfAbsent('Accept', () => 'application/json');
|
headers.putIfAbsent('Accept', () => 'application/json');
|
||||||
headers.putIfAbsent('OCS-APIRequest', () => 'true');
|
headers.putIfAbsent('OCS-APIRequest', () => 'true');
|
||||||
|
|
||||||
Uri endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/apps/files_sharing/api/v1/shares', query.toJson().map((key, value) => MapEntry(key, value.toString())));
|
var endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/apps/files_sharing/api/v1/shares', query.toJson().map((key, value) => MapEntry(key, value.toString())));
|
||||||
Response response = await http.post(endpoint, headers: headers);
|
var response = await http.post(endpoint, headers: headers);
|
||||||
|
|
||||||
if(response.statusCode != HttpStatus.ok) {
|
if(response.statusCode != HttpStatus.ok) {
|
||||||
throw Exception('Api call failed with ${response.statusCode}: ${response.body}');
|
throw Exception('Api call failed with ${response.statusCode}: ${response.body}');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -20,4 +20,4 @@ class FileSharingApiParams {
|
|||||||
|
|
||||||
factory FileSharingApiParams.fromJson(Map<String, dynamic> json) => _$FileSharingApiParamsFromJson(json);
|
factory FileSharingApiParams.fromJson(Map<String, dynamic> json) => _$FileSharingApiParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$FileSharingApiParamsToJson(this);
|
Map<String, dynamic> toJson() => _$FileSharingApiParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -14,13 +14,9 @@ class GetChat extends TalkApi<GetChatResponse> {
|
|||||||
GetChat(this.chatToken, this.params) : super('v1/chat/$chatToken', null, getParameters: params.toJson());
|
GetChat(this.chatToken, this.params) : super('v1/chat/$chatToken', null, getParameters: params.toJson());
|
||||||
|
|
||||||
@override
|
@override
|
||||||
assemble(String raw) {
|
assemble(String raw) => GetChatResponse.fromJson(jsonDecode(raw)['ocs']);
|
||||||
return GetChatResponse.fromJson(jsonDecode(raw)['ocs']);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
|
Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.get(uri, headers: headers);
|
||||||
return http.get(uri, headers: headers);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -9,12 +9,11 @@ class GetChatCache extends RequestCache<GetChatResponse> {
|
|||||||
String chatToken;
|
String chatToken;
|
||||||
|
|
||||||
GetChatCache({required onUpdate, required this.chatToken}) : super(RequestCache.cacheNothing, onUpdate) {
|
GetChatCache({required onUpdate, required this.chatToken}) : super(RequestCache.cacheNothing, onUpdate) {
|
||||||
start('MarianumMobile', 'nc-chat-$chatToken');
|
start('nc-chat-$chatToken');
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetChatResponse> onLoad() {
|
Future<GetChatResponse> onLoad() => GetChat(
|
||||||
return GetChat(
|
|
||||||
chatToken,
|
chatToken,
|
||||||
GetChatParams(
|
GetChatParams(
|
||||||
lookIntoFuture: GetChatParamsSwitch.off,
|
lookIntoFuture: GetChatParamsSwitch.off,
|
||||||
@@ -22,11 +21,8 @@ class GetChatCache extends RequestCache<GetChatResponse> {
|
|||||||
limit: 200,
|
limit: 200,
|
||||||
)
|
)
|
||||||
).run();
|
).run();
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetChatResponse onLocalData(String json) {
|
GetChatResponse onLocalData(String json) => GetChatResponse.fromJson(jsonDecode(json));
|
||||||
return GetChatResponse.fromJson(jsonDecode(json));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -31,4 +31,4 @@ class GetChatParams extends ApiParams {
|
|||||||
enum GetChatParamsSwitch {
|
enum GetChatParamsSwitch {
|
||||||
@JsonValue(1) on,
|
@JsonValue(1) on,
|
||||||
@JsonValue(0) off,
|
@JsonValue(0) off,
|
||||||
}
|
}
|
||||||
|
@@ -16,7 +16,7 @@ class GetChatResponse extends ApiResponse {
|
|||||||
Map<String, dynamic> toJson() => _$GetChatResponseToJson(this);
|
Map<String, dynamic> toJson() => _$GetChatResponseToJson(this);
|
||||||
|
|
||||||
List<GetChatResponseObject> sortByTimestamp() {
|
List<GetChatResponseObject> sortByTimestamp() {
|
||||||
List<GetChatResponseObject> sorted = data.toList();
|
var sorted = data.toList();
|
||||||
sorted.sort((a, b) => a.timestamp.compareTo(b.timestamp));
|
sorted.sort((a, b) => a.timestamp.compareTo(b.timestamp));
|
||||||
return sorted;
|
return sorted;
|
||||||
}
|
}
|
||||||
@@ -38,6 +38,7 @@ class GetChatResponseObject {
|
|||||||
Map<String, int>? reactions;
|
Map<String, int>? reactions;
|
||||||
List<String>? reactionsSelf;
|
List<String>? reactionsSelf;
|
||||||
@JsonKey(fromJson: _fromJson) Map<String, RichObjectString>? messageParameters;
|
@JsonKey(fromJson: _fromJson) Map<String, RichObjectString>? messageParameters;
|
||||||
|
GetChatResponseObject? parent;
|
||||||
|
|
||||||
GetChatResponseObject(
|
GetChatResponseObject(
|
||||||
this.id,
|
this.id,
|
||||||
@@ -53,19 +54,19 @@ class GetChatResponseObject {
|
|||||||
this.message,
|
this.message,
|
||||||
this.messageParameters,
|
this.messageParameters,
|
||||||
this.reactions,
|
this.reactions,
|
||||||
this.reactionsSelf
|
this.reactionsSelf,
|
||||||
|
this.parent,
|
||||||
);
|
);
|
||||||
|
|
||||||
factory GetChatResponseObject.fromJson(Map<String, dynamic> json) => _$GetChatResponseObjectFromJson(json);
|
factory GetChatResponseObject.fromJson(Map<String, dynamic> json) => _$GetChatResponseObjectFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$GetChatResponseObjectToJson(this);
|
Map<String, dynamic> toJson() => _$GetChatResponseObjectToJson(this);
|
||||||
|
|
||||||
static GetChatResponseObject getDateDummy(int timestamp) {
|
static GetChatResponseObject getDateDummy(int timestamp) {
|
||||||
DateTime elementDate = DateTime.fromMillisecondsSinceEpoch(timestamp * 1000);
|
var elementDate = DateTime.fromMillisecondsSinceEpoch(timestamp * 1000);
|
||||||
return getTextDummy(Jiffy.parseFromDateTime(elementDate).format(pattern: 'dd.MM.yyyy'));
|
return getTextDummy(Jiffy.parseFromDateTime(elementDate).format(pattern: 'dd.MM.yyyy'));
|
||||||
}
|
}
|
||||||
|
|
||||||
static GetChatResponseObject getTextDummy(String text) {
|
static GetChatResponseObject getTextDummy(String text) => GetChatResponseObject(
|
||||||
return GetChatResponseObject(
|
|
||||||
0,
|
0,
|
||||||
'',
|
'',
|
||||||
GetRoomResponseObjectMessageActorType.user,
|
GetRoomResponseObjectMessageActorType.user,
|
||||||
@@ -79,15 +80,15 @@ class GetChatResponseObject {
|
|||||||
text,
|
text,
|
||||||
null,
|
null,
|
||||||
null,
|
null,
|
||||||
null
|
null,
|
||||||
|
null,
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, RichObjectString>? _fromJson(json) {
|
Map<String, RichObjectString>? _fromJson(json) {
|
||||||
if(json is Map<String, dynamic>) {
|
if(json is Map<String, dynamic>) {
|
||||||
Map<String, RichObjectString> data = {};
|
var data = <String, RichObjectString>{};
|
||||||
for (var element in json.keys) {
|
for (var element in json.keys) {
|
||||||
data.putIfAbsent(element, () => RichObjectString.fromJson(json[element]));
|
data.putIfAbsent(element, () => RichObjectString.fromJson(json[element]));
|
||||||
}
|
}
|
||||||
@@ -119,4 +120,4 @@ enum RichObjectStringObjectType {
|
|||||||
@JsonValue('guest') guest,
|
@JsonValue('guest') guest,
|
||||||
@JsonValue('highlight') highlight,
|
@JsonValue('highlight') highlight,
|
||||||
@JsonValue('talk-poll') talkPoll,
|
@JsonValue('talk-poll') talkPoll,
|
||||||
}
|
}
|
||||||
|
@@ -52,6 +52,10 @@ GetChatResponseObject _$GetChatResponseObjectFromJson(
|
|||||||
(json['reactionsSelf'] as List<dynamic>?)
|
(json['reactionsSelf'] as List<dynamic>?)
|
||||||
?.map((e) => e as String)
|
?.map((e) => e as String)
|
||||||
.toList(),
|
.toList(),
|
||||||
|
json['parent'] == null
|
||||||
|
? null
|
||||||
|
: GetChatResponseObject.fromJson(
|
||||||
|
json['parent'] as Map<String, dynamic>),
|
||||||
);
|
);
|
||||||
|
|
||||||
Map<String, dynamic> _$GetChatResponseObjectToJson(
|
Map<String, dynamic> _$GetChatResponseObjectToJson(
|
||||||
@@ -74,6 +78,7 @@ Map<String, dynamic> _$GetChatResponseObjectToJson(
|
|||||||
'reactionsSelf': instance.reactionsSelf,
|
'reactionsSelf': instance.reactionsSelf,
|
||||||
'messageParameters':
|
'messageParameters':
|
||||||
instance.messageParameters?.map((k, e) => MapEntry(k, e.toJson())),
|
instance.messageParameters?.map((k, e) => MapEntry(k, e.toJson())),
|
||||||
|
'parent': instance.parent?.toJson(),
|
||||||
};
|
};
|
||||||
|
|
||||||
const _$GetRoomResponseObjectMessageActorTypeEnumMap = {
|
const _$GetRoomResponseObjectMessageActorTypeEnumMap = {
|
||||||
|
@@ -11,4 +11,4 @@ class RichObjectStringProcessor {
|
|||||||
|
|
||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -10,9 +10,7 @@ class CreateRoom extends TalkApi {
|
|||||||
CreateRoom(this.params) : super('v4/room', params);
|
CreateRoom(this.params) : super('v4/room', params);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
assemble(String raw) {
|
assemble(String raw) => null;
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response>? request(Uri uri, Object? body, Map<String, String>? headers) {
|
Future<Response>? request(Uri uri, Object? body, Map<String, String>? headers) {
|
||||||
@@ -22,4 +20,4 @@ class CreateRoom extends TalkApi {
|
|||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -24,4 +24,4 @@ class CreateRoomParams extends ApiParams {
|
|||||||
|
|
||||||
factory CreateRoomParams.fromJson(Map<String, dynamic> json) => _$CreateRoomParamsFromJson(json);
|
factory CreateRoomParams.fromJson(Map<String, dynamic> json) => _$CreateRoomParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$CreateRoomParamsToJson(this);
|
Map<String, dynamic> toJson() => _$CreateRoomParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -10,13 +10,9 @@ class DeleteMessage extends TalkApi {
|
|||||||
DeleteMessage(this.chatToken, this.messageId) : super('v1/chat/$chatToken/$messageId', null);
|
DeleteMessage(this.chatToken, this.messageId) : super('v1/chat/$chatToken/$messageId', null);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
assemble(String raw) {
|
assemble(String raw) => null;
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
|
Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) => http.delete(uri, headers: headers);
|
||||||
return http.delete(uri, headers: headers);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -11,9 +11,7 @@ class DeleteReactMessage extends TalkApi {
|
|||||||
DeleteReactMessage({required this.chatToken, required this.messageId, required DeleteReactMessageParams params}) : super('v1/reaction/$chatToken/$messageId', params);
|
DeleteReactMessage({required this.chatToken, required this.messageId, required DeleteReactMessageParams params}) : super('v1/reaction/$chatToken/$messageId', params);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
assemble(String raw) {
|
assemble(String raw) => null;
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
|
Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
|
||||||
@@ -23,4 +21,4 @@ class DeleteReactMessage extends TalkApi {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -12,4 +12,4 @@ class DeleteReactMessageParams extends ApiParams {
|
|||||||
|
|
||||||
factory DeleteReactMessageParams.fromJson(Map<String, dynamic> json) => _$DeleteReactMessageParamsFromJson(json);
|
factory DeleteReactMessageParams.fromJson(Map<String, dynamic> json) => _$DeleteReactMessageParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$DeleteReactMessageParamsToJson(this);
|
Map<String, dynamic> toJson() => _$DeleteReactMessageParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -10,13 +10,9 @@ class GetParticipants extends TalkApi<GetParticipantsResponse> {
|
|||||||
GetParticipants(this.token) : super('v4/room/$token/participants', null);
|
GetParticipants(this.token) : super('v4/room/$token/participants', null);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetParticipantsResponse assemble(String raw) {
|
GetParticipantsResponse assemble(String raw) => GetParticipantsResponse.fromJson(jsonDecode(raw)['ocs']);
|
||||||
return GetParticipantsResponse.fromJson(jsonDecode(raw)['ocs']);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) {
|
Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.get(uri, headers: headers);
|
||||||
return http.get(uri, headers: headers);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -8,19 +8,15 @@ class GetParticipantsCache extends RequestCache<GetParticipantsResponse> {
|
|||||||
String chatToken;
|
String chatToken;
|
||||||
|
|
||||||
GetParticipantsCache({required onUpdate, required this.chatToken}) : super(RequestCache.cacheNothing, onUpdate) {
|
GetParticipantsCache({required onUpdate, required this.chatToken}) : super(RequestCache.cacheNothing, onUpdate) {
|
||||||
start('MarianumMobile', 'nc-chat-participants-$chatToken');
|
start('nc-chat-participants-$chatToken');
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetParticipantsResponse> onLoad() {
|
Future<GetParticipantsResponse> onLoad() => GetParticipants(
|
||||||
return GetParticipants(
|
|
||||||
chatToken,
|
chatToken,
|
||||||
).run();
|
).run();
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetParticipantsResponse onLocalData(String json) {
|
GetParticipantsResponse onLocalData(String json) => GetParticipantsResponse.fromJson(jsonDecode(json));
|
||||||
return GetParticipantsResponse.fromJson(jsonDecode(json));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -69,4 +69,4 @@ enum GetParticipantsResponseObjectParticipantsInCallFlags {
|
|||||||
@JsonValue(2) providesAudio,
|
@JsonValue(2) providesAudio,
|
||||||
@JsonValue(3) providesVideo,
|
@JsonValue(3) providesVideo,
|
||||||
@JsonValue(4) usesSipDialIn
|
@JsonValue(4) usesSipDialIn
|
||||||
}
|
}
|
||||||
|
@@ -13,13 +13,9 @@ class GetReactions extends TalkApi<GetReactionsResponse> {
|
|||||||
GetReactions({required this.chatToken, required this.messageId}) : super('v1/reaction/$chatToken/$messageId', null);
|
GetReactions({required this.chatToken, required this.messageId}) : super('v1/reaction/$chatToken/$messageId', null);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
assemble(String raw) {
|
assemble(String raw) => GetReactionsResponse.fromJson(jsonDecode(raw)['ocs']);
|
||||||
return GetReactionsResponse.fromJson(jsonDecode(raw)['ocs']);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
|
Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) => http.get(uri, headers: headers);
|
||||||
return http.get(uri, headers: headers);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -30,4 +30,4 @@ class GetReactionsResponseObject {
|
|||||||
enum GetReactionsResponseObjectActorType {
|
enum GetReactionsResponseObjectActorType {
|
||||||
@JsonValue('guests') guests,
|
@JsonValue('guests') guests,
|
||||||
@JsonValue('users') users,
|
@JsonValue('users') users,
|
||||||
}
|
}
|
||||||
|
@@ -9,12 +9,8 @@ class LeaveRoom extends TalkApi {
|
|||||||
LeaveRoom(this.chatToken) : super('v4/room/$chatToken/participants/self', null);
|
LeaveRoom(this.chatToken) : super('v4/room/$chatToken/participants/self', null);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
assemble(String raw) {
|
assemble(String raw) => null;
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
|
Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.delete(uri, headers: headers);
|
||||||
return http.delete(uri, headers: headers);
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -11,9 +11,7 @@ class ReactMessage extends TalkApi {
|
|||||||
ReactMessage({required this.chatToken, required this.messageId, required ReactMessageParams params}) : super('v1/reaction/$chatToken/$messageId', params);
|
ReactMessage({required this.chatToken, required this.messageId, required ReactMessageParams params}) : super('v1/reaction/$chatToken/$messageId', params);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
assemble(String raw) {
|
assemble(String raw) => null;
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
|
Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
|
||||||
@@ -23,4 +21,4 @@ class ReactMessage extends TalkApi {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -12,4 +12,4 @@ class ReactMessageParams extends ApiParams {
|
|||||||
|
|
||||||
factory ReactMessageParams.fromJson(Map<String, dynamic> json) => _$ReactMessageParamsFromJson(json);
|
factory ReactMessageParams.fromJson(Map<String, dynamic> json) => _$ReactMessageParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$ReactMessageParamsToJson(this);
|
Map<String, dynamic> toJson() => _$ReactMessageParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -14,13 +14,9 @@ class GetRoom extends TalkApi<GetRoomResponse> {
|
|||||||
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetRoomResponse assemble(String raw) {
|
GetRoomResponse assemble(String raw) => GetRoomResponse.fromJson(jsonDecode(raw)['ocs']);
|
||||||
return GetRoomResponse.fromJson(jsonDecode(raw)['ocs']);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) {
|
Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.get(uri, headers: headers);
|
||||||
return http.get(uri, headers: headers);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -8,20 +8,16 @@ import 'getRoomResponse.dart';
|
|||||||
|
|
||||||
class GetRoomCache extends RequestCache<GetRoomResponse> {
|
class GetRoomCache extends RequestCache<GetRoomResponse> {
|
||||||
GetRoomCache({onUpdate, renew}) : super(RequestCache.cacheMinute, onUpdate, renew: renew) {
|
GetRoomCache({onUpdate, renew}) : super(RequestCache.cacheMinute, onUpdate, renew: renew) {
|
||||||
start('MarianumMobile', 'nc-rooms');
|
start('nc-rooms');
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetRoomResponse onLocalData(String json) {
|
GetRoomResponse onLocalData(String json) => GetRoomResponse.fromJson(jsonDecode(json));
|
||||||
return GetRoomResponse.fromJson(jsonDecode(json));
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetRoomResponse> onLoad() {
|
Future<GetRoomResponse> onLoad() => GetRoom(
|
||||||
return GetRoom(
|
|
||||||
GetRoomParams(
|
GetRoomParams(
|
||||||
includeStatus: true,
|
includeStatus: true,
|
||||||
)
|
)
|
||||||
).run();
|
).run();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
@@ -22,4 +22,4 @@ class GetRoomParams extends ApiParams {
|
|||||||
enum GetRoomParamsStatusUpdate {
|
enum GetRoomParamsStatusUpdate {
|
||||||
@JsonValue(0) defaults,
|
@JsonValue(0) defaults,
|
||||||
@JsonValue(1) keepAlive,
|
@JsonValue(1) keepAlive,
|
||||||
}
|
}
|
||||||
|
@@ -164,4 +164,4 @@ enum GetRoomResponseObjectMessageType {
|
|||||||
@JsonValue('comment_deleted') deletedComment,
|
@JsonValue('comment_deleted') deletedComment,
|
||||||
@JsonValue('system') system,
|
@JsonValue('system') system,
|
||||||
@JsonValue('command') command,
|
@JsonValue('command') command,
|
||||||
}
|
}
|
||||||
|
@@ -10,9 +10,7 @@ class SendMessage extends TalkApi {
|
|||||||
SendMessage(this.chatToken, SendMessageParams params) : super('v1/chat/$chatToken', params);
|
SendMessage(this.chatToken, SendMessageParams params) : super('v1/chat/$chatToken', params);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
assemble(String raw) {
|
assemble(String raw) => null;
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
|
Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
|
||||||
@@ -22,4 +20,4 @@ class SendMessage extends TalkApi {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -7,10 +7,10 @@ part 'sendMessageParams.g.dart';
|
|||||||
@JsonSerializable(explicitToJson: true, includeIfNull: false)
|
@JsonSerializable(explicitToJson: true, includeIfNull: false)
|
||||||
class SendMessageParams extends ApiParams {
|
class SendMessageParams extends ApiParams {
|
||||||
String message;
|
String message;
|
||||||
int? replyTo;
|
String? replyTo;
|
||||||
|
|
||||||
SendMessageParams(this.message, {this.replyTo});
|
SendMessageParams(this.message, {this.replyTo});
|
||||||
|
|
||||||
factory SendMessageParams.fromJson(Map<String, dynamic> json) => _$SendMessageParamsFromJson(json);
|
factory SendMessageParams.fromJson(Map<String, dynamic> json) => _$SendMessageParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$SendMessageParamsToJson(this);
|
Map<String, dynamic> toJson() => _$SendMessageParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -9,7 +9,7 @@ part of 'sendMessageParams.dart';
|
|||||||
SendMessageParams _$SendMessageParamsFromJson(Map<String, dynamic> json) =>
|
SendMessageParams _$SendMessageParamsFromJson(Map<String, dynamic> json) =>
|
||||||
SendMessageParams(
|
SendMessageParams(
|
||||||
json['message'] as String,
|
json['message'] as String,
|
||||||
replyTo: json['replyTo'] as int?,
|
replyTo: json['replyTo'] as String?,
|
||||||
);
|
);
|
||||||
|
|
||||||
Map<String, dynamic> _$SendMessageParamsToJson(SendMessageParams instance) {
|
Map<String, dynamic> _$SendMessageParamsToJson(SendMessageParams instance) {
|
||||||
|
@@ -2,4 +2,4 @@ import '../../../apiResponse.dart';
|
|||||||
|
|
||||||
class SendMessageResponse extends ApiResponse {
|
class SendMessageResponse extends ApiResponse {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -11,9 +11,7 @@ class SetFavorite extends TalkApi {
|
|||||||
SetFavorite(this.chatToken, this.favoriteState) : super('v4/room/$chatToken/favorite', null);
|
SetFavorite(this.chatToken, this.favoriteState) : super('v4/room/$chatToken/favorite', null);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
assemble(String raw) {
|
assemble(String raw) => null;
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
|
Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
|
||||||
@@ -24,4 +22,4 @@ class SetFavorite extends TalkApi {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -15,9 +15,7 @@ class SetReadMarker extends TalkApi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
assemble(String raw) {
|
assemble(String raw) => null;
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
|
Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
|
||||||
@@ -29,4 +27,4 @@ class SetReadMarker extends TalkApi {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -14,4 +14,4 @@ class SetReadMarkerParams extends ApiParams {
|
|||||||
|
|
||||||
factory SetReadMarkerParams.fromJson(Map<String, dynamic> json) => _$SetReadMarkerParamsFromJson(json);
|
factory SetReadMarkerParams.fromJson(Map<String, dynamic> json) => _$SetReadMarkerParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$SetReadMarkerParamsToJson(this);
|
Map<String, dynamic> toJson() => _$SetReadMarkerParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -34,7 +34,7 @@ abstract class TalkApi<T extends ApiResponse?> extends ApiRequest {
|
|||||||
getParameters?.update(key, (value) => value.toString());
|
getParameters?.update(key, (value) => value.toString());
|
||||||
});
|
});
|
||||||
|
|
||||||
Uri endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/apps/spreed/api/$path', getParameters);
|
var endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/apps/spreed/api/$path', getParameters);
|
||||||
|
|
||||||
headers ??= {};
|
headers ??= {};
|
||||||
headers?.putIfAbsent('Accept', () => 'application/json');
|
headers?.putIfAbsent('Accept', () => 'application/json');
|
||||||
@@ -65,4 +65,4 @@ abstract class TalkApi<T extends ApiResponse?> extends ApiRequest {
|
|||||||
throw Exception('Error assembling Talk API response');
|
throw Exception('Error assembling Talk API response');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -6,7 +6,5 @@ class TalkError {
|
|||||||
TalkError(this.status, this.code, this.message);
|
TalkError(this.status, this.code, this.message);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String toString() {
|
String toString() => 'Talk - $status - ($code): $message';
|
||||||
return 'Talk - $status - ($code): $message';
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -19,4 +19,4 @@ class DownloadFile extends WebdavApi<DownloadFileParams> {
|
|||||||
// OpenFile.open(localPath);
|
// OpenFile.open(localPath);
|
||||||
throw UnimplementedError();
|
throw UnimplementedError();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -14,4 +14,4 @@ class DownloadFileParams extends ApiParams {
|
|||||||
|
|
||||||
factory DownloadFileParams.fromJson(Map<String, dynamic> json) => _$DownloadFileParamsFromJson(json);
|
factory DownloadFileParams.fromJson(Map<String, dynamic> json) => _$DownloadFileParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$DownloadFileParamsToJson(this);
|
Map<String, dynamic> toJson() => _$DownloadFileParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -11,4 +11,4 @@ class DownloadFileResponse {
|
|||||||
|
|
||||||
factory DownloadFileResponse.fromJson(Map<String, dynamic> json) => _$DownloadFileResponseFromJson(json);
|
factory DownloadFileResponse.fromJson(Map<String, dynamic> json) => _$DownloadFileResponseFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$DownloadFileResponseToJson(this);
|
Map<String, dynamic> toJson() => _$DownloadFileResponseToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -34,4 +34,4 @@ class CacheableFile {
|
|||||||
|
|
||||||
factory CacheableFile.fromJson(Map<String, dynamic> json) => _$CacheableFileFromJson(json);
|
factory CacheableFile.fromJson(Map<String, dynamic> json) => _$CacheableFileFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$CacheableFileToJson(this);
|
Map<String, dynamic> toJson() => _$CacheableFileToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -13,8 +13,8 @@ class ListFiles extends WebdavApi<ListFilesParams> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<ListFilesResponse> run() async {
|
Future<ListFilesResponse> run() async {
|
||||||
List<WebDavFile> davFiles = (await (await WebdavApi.webdav).propfind(PathUri.parse(params.path))).toWebDavFiles();
|
var davFiles = (await (await WebdavApi.webdav).propfind(PathUri.parse(params.path))).toWebDavFiles();
|
||||||
Set<CacheableFile> files = davFiles.map(CacheableFile.fromDavFile).toSet();
|
var files = davFiles.map(CacheableFile.fromDavFile).toSet();
|
||||||
|
|
||||||
// webdav handles subdirectories wrong, this is a fix
|
// webdav handles subdirectories wrong, this is a fix
|
||||||
// currently this fix is not needed anymore
|
// currently this fix is not needed anymore
|
||||||
@@ -30,4 +30,4 @@ class ListFiles extends WebdavApi<ListFilesParams> {
|
|||||||
|
|
||||||
return ListFilesResponse(files);
|
return ListFilesResponse(files);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -11,19 +11,17 @@ class ListFilesCache extends RequestCache<ListFilesResponse> {
|
|||||||
|
|
||||||
ListFilesCache({required onUpdate, required this.path}) : super(RequestCache.cacheNothing, onUpdate) {
|
ListFilesCache({required onUpdate, required this.path}) : super(RequestCache.cacheNothing, onUpdate) {
|
||||||
var bytes = utf8.encode('MarianumMobile-$path');
|
var bytes = utf8.encode('MarianumMobile-$path');
|
||||||
String cacheName = md5.convert(bytes).toString();
|
var cacheName = md5.convert(bytes).toString();
|
||||||
start('MarianumMobile', 'wd-folder-$cacheName');
|
start('wd-folder-$cacheName');
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<ListFilesResponse> onLoad() async {
|
Future<ListFilesResponse> onLoad() async {
|
||||||
ListFilesResponse data = await ListFiles(ListFilesParams(path)).run();
|
var data = await ListFiles(ListFilesParams(path)).run();
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
ListFilesResponse onLocalData(String json) {
|
ListFilesResponse onLocalData(String json) => ListFilesResponse.fromJson(jsonDecode(json));
|
||||||
return ListFilesResponse.fromJson(jsonDecode(json));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -12,4 +12,4 @@ class ListFilesParams extends ApiParams {
|
|||||||
|
|
||||||
factory ListFilesParams.fromJson(Map<String, dynamic> json) => _$ListFilesParamsFromJson(json);
|
factory ListFilesParams.fromJson(Map<String, dynamic> json) => _$ListFilesParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$ListFilesParamsToJson(this);
|
Map<String, dynamic> toJson() => _$ListFilesParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -54,4 +54,4 @@ class ListFilesResponse extends ApiResponse {
|
|||||||
var list = files.toList()..sort((a, b) => b.sort!.compareTo(a.sort!));
|
var list = files.toList()..sort((a, b) => b.sort!.compareTo(a.sort!));
|
||||||
return reversed ? list.reversed.toList() : list;
|
return reversed ? list.reversed.toList() : list;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -17,11 +17,7 @@ abstract class WebdavApi<T> extends ApiRequest {
|
|||||||
static Future<WebDavClient> webdav = establishWebdavConnection();
|
static Future<WebDavClient> webdav = establishWebdavConnection();
|
||||||
static Future<String> webdavConnectString = buildWebdavConnectString();
|
static Future<String> webdavConnectString = buildWebdavConnectString();
|
||||||
|
|
||||||
static Future<WebDavClient> establishWebdavConnection() async {
|
static Future<WebDavClient> establishWebdavConnection() async => NextcloudClient(Uri.parse('https://${EndpointData().nextcloud().full()}'), password: AccountData().getPassword(), loginName: AccountData().getUsername()).webdav;
|
||||||
return NextcloudClient(Uri.parse('https://${EndpointData().nextcloud().full()}'), password: AccountData().getPassword(), loginName: AccountData().getUsername()).webdav;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Future<String> buildWebdavConnectString() async {
|
static Future<String> buildWebdavConnectString() async => 'https://${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().full()}/remote.php/dav/files/${AccountData().getUsername()}/';
|
||||||
return 'https://${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().full()}/remote.php/dav/files/${AccountData().getUsername()}/';
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -9,13 +9,9 @@ class GetBreakers extends MhslApi<GetBreakersResponse> {
|
|||||||
GetBreakers() : super('breaker/');
|
GetBreakers() : super('breaker/');
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetBreakersResponse assemble(String raw) {
|
GetBreakersResponse assemble(String raw) => GetBreakersResponse.fromJson(jsonDecode(raw));
|
||||||
return GetBreakersResponse.fromJson(jsonDecode(raw));
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response>? request(Uri uri) {
|
Future<Response>? request(Uri uri) => http.get(uri);
|
||||||
return http.get(uri);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -6,16 +6,12 @@ import 'getBreakersResponse.dart';
|
|||||||
|
|
||||||
class GetBreakersCache extends RequestCache<GetBreakersResponse> {
|
class GetBreakersCache extends RequestCache<GetBreakersResponse> {
|
||||||
GetBreakersCache({onUpdate, renew}) : super(RequestCache.cacheMinute, onUpdate, renew: renew) {
|
GetBreakersCache({onUpdate, renew}) : super(RequestCache.cacheMinute, onUpdate, renew: renew) {
|
||||||
start('MarianumMobile', 'breakers');
|
start('breakers');
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetBreakersResponse onLocalData(String json) {
|
GetBreakersResponse onLocalData(String json) => GetBreakersResponse.fromJson(jsonDecode(json));
|
||||||
return GetBreakersResponse.fromJson(jsonDecode(json));
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetBreakersResponse> onLoad() {
|
Future<GetBreakersResponse> onLoad() => GetBreakers().run();
|
||||||
return GetBreakers().run();
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -33,4 +33,4 @@ enum BreakerArea {
|
|||||||
@JsonValue('TALK') talk,
|
@JsonValue('TALK') talk,
|
||||||
@JsonValue('FILES') files,
|
@JsonValue('FILES') files,
|
||||||
@JsonValue('MORE') more,
|
@JsonValue('MORE') more,
|
||||||
}
|
}
|
||||||
|
@@ -16,7 +16,7 @@ class AddCustomTimetableEvent extends MhslApi<void> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response>? request(Uri uri) {
|
Future<Response>? request(Uri uri) {
|
||||||
String body = jsonEncode(params.toJson());
|
var body = jsonEncode(params.toJson());
|
||||||
return http.post(uri, body: body);
|
return http.post(uri, body: body);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -13,4 +13,4 @@ class AddCustomTimetableEventParams {
|
|||||||
|
|
||||||
factory AddCustomTimetableEventParams.fromJson(Map<String, dynamic> json) => _$AddCustomTimetableEventParamsFromJson(json);
|
factory AddCustomTimetableEventParams.fromJson(Map<String, dynamic> json) => _$AddCustomTimetableEventParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$AddCustomTimetableEventParamsToJson(this);
|
Map<String, dynamic> toJson() => _$AddCustomTimetableEventParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -25,4 +25,4 @@ class CustomTimetableEvent {
|
|||||||
|
|
||||||
factory CustomTimetableEvent.fromJson(Map<String, dynamic> json) => _$CustomTimetableEventFromJson(json);
|
factory CustomTimetableEvent.fromJson(Map<String, dynamic> json) => _$CustomTimetableEventFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$CustomTimetableEventToJson(this);
|
Map<String, dynamic> toJson() => _$CustomTimetableEventToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -12,12 +12,8 @@ class GetCustomTimetableEvent extends MhslApi<GetCustomTimetableEventResponse> {
|
|||||||
GetCustomTimetableEvent(this.params) : super('server/timetable/customEvents?user=${params.user}');
|
GetCustomTimetableEvent(this.params) : super('server/timetable/customEvents?user=${params.user}');
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetCustomTimetableEventResponse assemble(String raw) {
|
GetCustomTimetableEventResponse assemble(String raw) => GetCustomTimetableEventResponse.fromJson({'events': jsonDecode(raw)});
|
||||||
return GetCustomTimetableEventResponse.fromJson({'events': jsonDecode(raw)});
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response>? request(Uri uri) {
|
Future<Response>? request(Uri uri) => http.get(uri);
|
||||||
return http.get(uri);
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -9,16 +9,12 @@ class GetCustomTimetableEventCache extends RequestCache<GetCustomTimetableEventR
|
|||||||
GetCustomTimetableEventParams params;
|
GetCustomTimetableEventParams params;
|
||||||
|
|
||||||
GetCustomTimetableEventCache(this.params, {onUpdate, renew}) : super(RequestCache.cacheMinute, onUpdate, renew: renew) {
|
GetCustomTimetableEventCache(this.params, {onUpdate, renew}) : super(RequestCache.cacheMinute, onUpdate, renew: renew) {
|
||||||
start('MarianumMobile', 'customTimetableEvents');
|
start('customTimetableEvents');
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetCustomTimetableEventResponse> onLoad() {
|
Future<GetCustomTimetableEventResponse> onLoad() => GetCustomTimetableEvent(params).run();
|
||||||
return GetCustomTimetableEvent(params).run();
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetCustomTimetableEventResponse onLocalData(String json) {
|
GetCustomTimetableEventResponse onLocalData(String json) => GetCustomTimetableEventResponse.fromJson(jsonDecode(json));
|
||||||
return GetCustomTimetableEventResponse.fromJson(jsonDecode(json));
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -10,4 +10,4 @@ class GetCustomTimetableEventParams {
|
|||||||
|
|
||||||
factory GetCustomTimetableEventParams.fromJson(Map<String, dynamic> json) => _$GetCustomTimetableEventParamsFromJson(json);
|
factory GetCustomTimetableEventParams.fromJson(Map<String, dynamic> json) => _$GetCustomTimetableEventParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$GetCustomTimetableEventParamsToJson(this);
|
Map<String, dynamic> toJson() => _$GetCustomTimetableEventParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -13,4 +13,4 @@ class GetCustomTimetableEventResponse extends ApiResponse {
|
|||||||
|
|
||||||
factory GetCustomTimetableEventResponse.fromJson(Map<String, dynamic> json) => _$GetCustomTimetableEventResponseFromJson(json);
|
factory GetCustomTimetableEventResponse.fromJson(Map<String, dynamic> json) => _$GetCustomTimetableEventResponseFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$GetCustomTimetableEventResponseToJson(this);
|
Map<String, dynamic> toJson() => _$GetCustomTimetableEventResponseToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -15,7 +15,5 @@ class RemoveCustomTimetableEvent extends MhslApi<void> {
|
|||||||
void assemble(String raw) {}
|
void assemble(String raw) {}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response>? request(Uri uri) {
|
Future<Response>? request(Uri uri) => http.delete(uri, body: jsonEncode(params.toJson()));
|
||||||
return http.delete(uri, body: jsonEncode(params.toJson()));
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -10,4 +10,4 @@ class RemoveCustomTimetableEventParams {
|
|||||||
|
|
||||||
factory RemoveCustomTimetableEventParams.fromJson(Map<String, dynamic> json) => _$RemoveCustomTimetableEventParamsFromJson(json);
|
factory RemoveCustomTimetableEventParams.fromJson(Map<String, dynamic> json) => _$RemoveCustomTimetableEventParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$RemoveCustomTimetableEventParamsToJson(this);
|
Map<String, dynamic> toJson() => _$RemoveCustomTimetableEventParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -15,7 +15,5 @@ class UpdateCustomTimetableEvent extends MhslApi<void> {
|
|||||||
void assemble(String raw) {}
|
void assemble(String raw) {}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response>? request(Uri uri) {
|
Future<Response>? request(Uri uri) => http.patch(uri, body: jsonEncode(params.toJson()));
|
||||||
return http.patch(uri, body: jsonEncode(params.toJson()));
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -14,4 +14,4 @@ class UpdateCustomTimetableEventParams {
|
|||||||
|
|
||||||
factory UpdateCustomTimetableEventParams.fromJson(Map<String, dynamic> json) => _$UpdateCustomTimetableEventParamsFromJson(json);
|
factory UpdateCustomTimetableEventParams.fromJson(Map<String, dynamic> json) => _$UpdateCustomTimetableEventParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$UpdateCustomTimetableEventParamsToJson(this);
|
Map<String, dynamic> toJson() => _$UpdateCustomTimetableEventParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -1,21 +0,0 @@
|
|||||||
import 'dart:convert';
|
|
||||||
|
|
||||||
import 'package:http/http.dart' as http;
|
|
||||||
|
|
||||||
import '../../mhslApi.dart';
|
|
||||||
import 'getMessagesResponse.dart';
|
|
||||||
|
|
||||||
class GetMessages extends MhslApi<GetMessagesResponse> {
|
|
||||||
GetMessages() : super('message/messages.json');
|
|
||||||
|
|
||||||
|
|
||||||
@override
|
|
||||||
GetMessagesResponse assemble(String raw) {
|
|
||||||
return GetMessagesResponse.fromJson(jsonDecode(raw));
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Future<http.Response> request(Uri uri) {
|
|
||||||
return http.get(uri);
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,21 +0,0 @@
|
|||||||
import 'dart:convert';
|
|
||||||
|
|
||||||
import '../../../requestCache.dart';
|
|
||||||
import 'getMessages.dart';
|
|
||||||
import 'getMessagesResponse.dart';
|
|
||||||
|
|
||||||
class GetMessagesCache extends RequestCache<GetMessagesResponse> {
|
|
||||||
GetMessagesCache({onUpdate, renew}) : super(RequestCache.cacheMinute, onUpdate, renew: renew) {
|
|
||||||
start('MarianumMobile', 'message');
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
GetMessagesResponse onLocalData(String json) {
|
|
||||||
return GetMessagesResponse.fromJson(jsonDecode(json));
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Future<GetMessagesResponse> onLoad() {
|
|
||||||
return GetMessages().run();
|
|
||||||
}
|
|
||||||
}
|
|
@@ -1,28 +0,0 @@
|
|||||||
import 'package:json_annotation/json_annotation.dart';
|
|
||||||
|
|
||||||
import '../../../apiResponse.dart';
|
|
||||||
|
|
||||||
part 'getMessagesResponse.g.dart';
|
|
||||||
|
|
||||||
@JsonSerializable(explicitToJson: true)
|
|
||||||
class GetMessagesResponse extends ApiResponse {
|
|
||||||
String base;
|
|
||||||
Set<GetMessagesResponseObject> messages;
|
|
||||||
|
|
||||||
GetMessagesResponse(this.base, this.messages);
|
|
||||||
|
|
||||||
factory GetMessagesResponse.fromJson(Map<String, dynamic> json) => _$GetMessagesResponseFromJson(json);
|
|
||||||
Map<String, dynamic> toJson() => _$GetMessagesResponseToJson(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@JsonSerializable(explicitToJson: true)
|
|
||||||
class GetMessagesResponseObject {
|
|
||||||
String name;
|
|
||||||
String date;
|
|
||||||
String url;
|
|
||||||
|
|
||||||
GetMessagesResponseObject(this.name, this.date, this.url);
|
|
||||||
|
|
||||||
factory GetMessagesResponseObject.fromJson(Map<String, dynamic> json) => _$GetMessagesResponseObjectFromJson(json);
|
|
||||||
Map<String, dynamic> toJson() => _$GetMessagesResponseObjectToJson(this);
|
|
||||||
}
|
|
@@ -1,49 +0,0 @@
|
|||||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
|
||||||
|
|
||||||
part of 'getMessagesResponse.dart';
|
|
||||||
|
|
||||||
// **************************************************************************
|
|
||||||
// JsonSerializableGenerator
|
|
||||||
// **************************************************************************
|
|
||||||
|
|
||||||
GetMessagesResponse _$GetMessagesResponseFromJson(Map<String, dynamic> json) =>
|
|
||||||
GetMessagesResponse(
|
|
||||||
json['base'] as String,
|
|
||||||
(json['messages'] as List<dynamic>)
|
|
||||||
.map((e) =>
|
|
||||||
GetMessagesResponseObject.fromJson(e as Map<String, dynamic>))
|
|
||||||
.toSet(),
|
|
||||||
)..headers = (json['headers'] as Map<String, dynamic>?)?.map(
|
|
||||||
(k, e) => MapEntry(k, e as String),
|
|
||||||
);
|
|
||||||
|
|
||||||
Map<String, dynamic> _$GetMessagesResponseToJson(GetMessagesResponse instance) {
|
|
||||||
final val = <String, dynamic>{};
|
|
||||||
|
|
||||||
void writeNotNull(String key, dynamic value) {
|
|
||||||
if (value != null) {
|
|
||||||
val[key] = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
writeNotNull('headers', instance.headers);
|
|
||||||
val['base'] = instance.base;
|
|
||||||
val['messages'] = instance.messages.map((e) => e.toJson()).toList();
|
|
||||||
return val;
|
|
||||||
}
|
|
||||||
|
|
||||||
GetMessagesResponseObject _$GetMessagesResponseObjectFromJson(
|
|
||||||
Map<String, dynamic> json) =>
|
|
||||||
GetMessagesResponseObject(
|
|
||||||
json['name'] as String,
|
|
||||||
json['date'] as String,
|
|
||||||
json['url'] as String,
|
|
||||||
);
|
|
||||||
|
|
||||||
Map<String, dynamic> _$GetMessagesResponseObjectToJson(
|
|
||||||
GetMessagesResponseObject instance) =>
|
|
||||||
<String, dynamic>{
|
|
||||||
'name': instance.name,
|
|
||||||
'date': instance.date,
|
|
||||||
'url': instance.url,
|
|
||||||
};
|
|
@@ -15,9 +15,9 @@ abstract class MhslApi<T> extends ApiRequest {
|
|||||||
T assemble(String raw);
|
T assemble(String raw);
|
||||||
|
|
||||||
Future<T> run() async {
|
Future<T> run() async {
|
||||||
Uri endpoint = Uri.parse('https://mhsl.eu/marianum/marianummobile/$subpath');
|
var endpoint = Uri.parse('https://mhsl.eu/marianum/marianummobile/$subpath');
|
||||||
|
|
||||||
http.Response? data = await request(endpoint);
|
var data = await request(endpoint);
|
||||||
if(data == null) {
|
if(data == null) {
|
||||||
throw ApiError('Request could not be dispatched!');
|
throw ApiError('Request could not be dispatched!');
|
||||||
}
|
}
|
||||||
@@ -31,5 +31,4 @@ abstract class MhslApi<T> extends ApiRequest {
|
|||||||
|
|
||||||
static String dateTimeToJson(DateTime time) => Jiffy.parseFromDateTime(time).format(pattern: 'yyyy-MM-dd HH:mm:ss');
|
static String dateTimeToJson(DateTime time) => Jiffy.parseFromDateTime(time).format(pattern: 'yyyy-MM-dd HH:mm:ss');
|
||||||
static DateTime dateTimeFromJson(String time) => DateTime.parse(time);
|
static DateTime dateTimeFromJson(String time) => DateTime.parse(time);
|
||||||
|
}
|
||||||
}
|
|
||||||
|
@@ -19,8 +19,8 @@ class NotifyRegister extends MhslApi<void> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<http.Response> request(Uri uri) {
|
Future<http.Response> request(Uri uri) {
|
||||||
String requestString = jsonEncode(params.toJson());
|
var requestString = jsonEncode(params.toJson());
|
||||||
log(requestString);
|
log(requestString);
|
||||||
return http.post(uri, body: requestString);
|
return http.post(uri, body: requestString);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -16,4 +16,4 @@ class NotifyRegisterParams {
|
|||||||
|
|
||||||
factory NotifyRegisterParams.fromJson(Map<String, dynamic> json) => _$NotifyRegisterParamsFromJson(json);
|
factory NotifyRegisterParams.fromJson(Map<String, dynamic> json) => _$NotifyRegisterParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$NotifyRegisterParamsToJson(this);
|
Map<String, dynamic> toJson() => _$NotifyRegisterParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -15,7 +15,5 @@ class AddFeedback extends MhslApi<void> {
|
|||||||
void assemble(String raw) {}
|
void assemble(String raw) {}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<Response>? request(Uri uri) {
|
Future<Response>? request(Uri uri) => http.post(uri, body: jsonEncode(params.toJson()));
|
||||||
return http.post(uri, body: jsonEncode(params.toJson()));
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -6,15 +6,17 @@ part 'addFeedbackParams.g.dart';
|
|||||||
class AddFeedbackParams {
|
class AddFeedbackParams {
|
||||||
String user;
|
String user;
|
||||||
String feedback;
|
String feedback;
|
||||||
|
String? screenshot;
|
||||||
int appVersion;
|
int appVersion;
|
||||||
|
|
||||||
|
|
||||||
AddFeedbackParams({
|
AddFeedbackParams({
|
||||||
required this.user,
|
required this.user,
|
||||||
required this.feedback,
|
required this.feedback,
|
||||||
|
this.screenshot,
|
||||||
required this.appVersion,
|
required this.appVersion,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory AddFeedbackParams.fromJson(Map<String, dynamic> json) => _$AddFeedbackParamsFromJson(json);
|
factory AddFeedbackParams.fromJson(Map<String, dynamic> json) => _$AddFeedbackParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$AddFeedbackParamsToJson(this);
|
Map<String, dynamic> toJson() => _$AddFeedbackParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -10,6 +10,7 @@ AddFeedbackParams _$AddFeedbackParamsFromJson(Map<String, dynamic> json) =>
|
|||||||
AddFeedbackParams(
|
AddFeedbackParams(
|
||||||
user: json['user'] as String,
|
user: json['user'] as String,
|
||||||
feedback: json['feedback'] as String,
|
feedback: json['feedback'] as String,
|
||||||
|
screenshot: json['screenshot'] as String?,
|
||||||
appVersion: json['appVersion'] as int,
|
appVersion: json['appVersion'] as int,
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -17,5 +18,6 @@ Map<String, dynamic> _$AddFeedbackParamsToJson(AddFeedbackParams instance) =>
|
|||||||
<String, dynamic>{
|
<String, dynamic>{
|
||||||
'user': instance.user,
|
'user': instance.user,
|
||||||
'feedback': instance.feedback,
|
'feedback': instance.feedback,
|
||||||
|
'screenshot': instance.screenshot,
|
||||||
'appVersion': instance.appVersion,
|
'appVersion': instance.appVersion,
|
||||||
};
|
};
|
||||||
|
@@ -21,4 +21,4 @@ class UpdateUserIndexParams {
|
|||||||
|
|
||||||
factory UpdateUserIndexParams.fromJson(Map<String, dynamic> json) => _$UpdateUserIndexParamsFromJson(json);
|
factory UpdateUserIndexParams.fromJson(Map<String, dynamic> json) => _$UpdateUserIndexParamsFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$UpdateUserIndexParamsToJson(this);
|
Map<String, dynamic> toJson() => _$UpdateUserIndexParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -19,12 +19,12 @@ class UpdateUserIndex extends MhslApi<void> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<http.Response> request(Uri uri) {
|
Future<http.Response> request(Uri uri) {
|
||||||
String data = jsonEncode(params.toJson());
|
var data = jsonEncode(params.toJson());
|
||||||
log('Updating userindex:\n $data');
|
log('Updating userindex:\n $data');
|
||||||
return http.post(uri, body: data);
|
return http.post(uri, body: data);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void index() async {
|
static Future<void> index() async {
|
||||||
UpdateUserIndex(
|
UpdateUserIndex(
|
||||||
UpdateUserIndexParams(
|
UpdateUserIndexParams(
|
||||||
username: AccountData().getUsername(),
|
username: AccountData().getUsername(),
|
||||||
@@ -35,4 +35,4 @@ class UpdateUserIndex extends MhslApi<void> {
|
|||||||
),
|
),
|
||||||
).run();
|
).run();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -11,6 +11,8 @@ abstract class RequestCache<T extends ApiResponse?> {
|
|||||||
static const int cacheHour = 60 * 60;
|
static const int cacheHour = 60 * 60;
|
||||||
static const int cacheDay = 60 * 60 * 24;
|
static const int cacheDay = 60 * 60 * 24;
|
||||||
|
|
||||||
|
static String collection = 'MarianumMobile';
|
||||||
|
|
||||||
int maxCacheTime;
|
int maxCacheTime;
|
||||||
Function(T) onUpdate;
|
Function(T) onUpdate;
|
||||||
Function(Exception) onError;
|
Function(Exception) onError;
|
||||||
@@ -20,8 +22,8 @@ abstract class RequestCache<T extends ApiResponse?> {
|
|||||||
|
|
||||||
static void ignore(Exception e) {}
|
static void ignore(Exception e) {}
|
||||||
|
|
||||||
void start(String file, String document) async {
|
Future<void> start(String document) async {
|
||||||
Map<String, dynamic>? tableData = await Localstore.instance.collection(file).doc(document).get();
|
var tableData = await Localstore.instance.collection(collection).doc(document).get();
|
||||||
if(tableData != null) {
|
if(tableData != null) {
|
||||||
onUpdate(onLocalData(tableData['json']));
|
onUpdate(onLocalData(tableData['json']));
|
||||||
}
|
}
|
||||||
@@ -31,10 +33,10 @@ abstract class RequestCache<T extends ApiResponse?> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
T newValue = await onLoad();
|
var newValue = await onLoad();
|
||||||
onUpdate(newValue);
|
onUpdate(newValue);
|
||||||
|
|
||||||
Localstore.instance.collection(file).doc(document).set({
|
Localstore.instance.collection(collection).doc(document).set({
|
||||||
'json': jsonEncode(newValue),
|
'json': jsonEncode(newValue),
|
||||||
'lastupdate': DateTime.now().millisecondsSinceEpoch
|
'lastupdate': DateTime.now().millisecondsSinceEpoch
|
||||||
});
|
});
|
||||||
@@ -46,4 +48,4 @@ abstract class RequestCache<T extends ApiResponse?> {
|
|||||||
T onLocalData(String json);
|
T onLocalData(String json);
|
||||||
Future<T> onLoad();
|
Future<T> onLoad();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -14,7 +14,7 @@ class Authenticate extends WebuntisApi {
|
|||||||
@override
|
@override
|
||||||
Future<AuthenticateResponse> run() async {
|
Future<AuthenticateResponse> run() async {
|
||||||
awaitingResponse = true;
|
awaitingResponse = true;
|
||||||
String rawAnswer = await query(this);
|
var rawAnswer = await query(this);
|
||||||
AuthenticateResponse response = finalize(AuthenticateResponse.fromJson(jsonDecode(rawAnswer)['result']));
|
AuthenticateResponse response = finalize(AuthenticateResponse.fromJson(jsonDecode(rawAnswer)['result']));
|
||||||
_lastResponse = response;
|
_lastResponse = response;
|
||||||
if(!awaitedResponse.isCompleted) awaitedResponse.complete();
|
if(!awaitedResponse.isCompleted) awaitedResponse.complete();
|
||||||
@@ -46,4 +46,4 @@ class Authenticate extends WebuntisApi {
|
|||||||
return _lastResponse!;
|
return _lastResponse!;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -14,4 +14,4 @@ class AuthenticateParams extends ApiParams {
|
|||||||
factory AuthenticateParams.fromJson(Map<String, dynamic> json) => _$AuthenticateParamsFromJson(json);
|
factory AuthenticateParams.fromJson(Map<String, dynamic> json) => _$AuthenticateParamsFromJson(json);
|
||||||
|
|
||||||
Map<String, dynamic> toJson() => _$AuthenticateParamsToJson(this);
|
Map<String, dynamic> toJson() => _$AuthenticateParamsToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -16,4 +16,4 @@ class AuthenticateResponse extends ApiResponse {
|
|||||||
|
|
||||||
factory AuthenticateResponse.fromJson(Map<String, dynamic> json) => _$AuthenticateResponseFromJson(json);
|
factory AuthenticateResponse.fromJson(Map<String, dynamic> json) => _$AuthenticateResponseFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$AuthenticateResponseToJson(this);
|
Map<String, dynamic> toJson() => _$AuthenticateResponseToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -8,7 +8,7 @@ class GetHolidays extends WebuntisApi {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetHolidaysResponse> run() async {
|
Future<GetHolidaysResponse> run() async {
|
||||||
String rawAnswer = await query(this);
|
var rawAnswer = await query(this);
|
||||||
return finalize(GetHolidaysResponse.fromJson(jsonDecode(rawAnswer)));
|
return finalize(GetHolidaysResponse.fromJson(jsonDecode(rawAnswer)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -17,12 +17,12 @@ class GetHolidays extends WebuntisApi {
|
|||||||
time = DateTime(time.year, time.month, time.day, 0, 0, 0, 0, 0);
|
time = DateTime(time.year, time.month, time.day, 0, 0, 0, 0, 0);
|
||||||
|
|
||||||
for (var element in holidaysResponse.result) {
|
for (var element in holidaysResponse.result) {
|
||||||
DateTime start = DateTime.parse(element.startDate.toString());
|
var start = DateTime.parse(element.startDate.toString());
|
||||||
DateTime end = DateTime.parse(element.endDate.toString());
|
var end = DateTime.parse(element.endDate.toString());
|
||||||
|
|
||||||
if(!start.isAfter(time) && !end.isBefore(time)) return element;
|
if(!start.isAfter(time) && !end.isBefore(time)) return element;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -6,16 +6,12 @@ import 'getHolidaysResponse.dart';
|
|||||||
|
|
||||||
class GetHolidaysCache extends RequestCache<GetHolidaysResponse> {
|
class GetHolidaysCache extends RequestCache<GetHolidaysResponse> {
|
||||||
GetHolidaysCache({onUpdate}) : super(RequestCache.cacheDay, onUpdate) {
|
GetHolidaysCache({onUpdate}) : super(RequestCache.cacheDay, onUpdate) {
|
||||||
start('MarianumMobile', 'wu-holidays');
|
start('wu-holidays');
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetHolidaysResponse> onLoad() {
|
Future<GetHolidaysResponse> onLoad() => GetHolidays().run();
|
||||||
return GetHolidays().run();
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetHolidaysResponse onLocalData(String json) {
|
GetHolidaysResponse onLocalData(String json) => GetHolidaysResponse.fromJson(jsonDecode(json));
|
||||||
return GetHolidaysResponse.fromJson(jsonDecode(json));
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -26,4 +26,4 @@ class GetHolidaysResponseObject {
|
|||||||
|
|
||||||
factory GetHolidaysResponseObject.fromJson(Map<String, dynamic> json) => _$GetHolidaysResponseObjectFromJson(json);
|
factory GetHolidaysResponseObject.fromJson(Map<String, dynamic> json) => _$GetHolidaysResponseObjectFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$GetHolidaysResponseObjectToJson(this);
|
Map<String, dynamic> toJson() => _$GetHolidaysResponseObjectToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -9,7 +9,7 @@ class GetRooms extends WebuntisApi {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetRoomsResponse> run() async {
|
Future<GetRoomsResponse> run() async {
|
||||||
String rawAnswer = await query(this);
|
var rawAnswer = await query(this);
|
||||||
try {
|
try {
|
||||||
return finalize(GetRoomsResponse.fromJson(jsonDecode(rawAnswer)));
|
return finalize(GetRoomsResponse.fromJson(jsonDecode(rawAnswer)));
|
||||||
} catch(e, trace) {
|
} catch(e, trace) {
|
||||||
@@ -20,4 +20,4 @@ class GetRooms extends WebuntisApi {
|
|||||||
throw Exception('Failed to parse getRoom server response: $rawAnswer');
|
throw Exception('Failed to parse getRoom server response: $rawAnswer');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -6,17 +6,13 @@ import 'getRoomsResponse.dart';
|
|||||||
|
|
||||||
class GetRoomsCache extends RequestCache<GetRoomsResponse> {
|
class GetRoomsCache extends RequestCache<GetRoomsResponse> {
|
||||||
GetRoomsCache({onUpdate}) : super(RequestCache.cacheHour, onUpdate) {
|
GetRoomsCache({onUpdate}) : super(RequestCache.cacheHour, onUpdate) {
|
||||||
start('MarianumMobile', 'wu-rooms');
|
start('wu-rooms');
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetRoomsResponse> onLoad() {
|
Future<GetRoomsResponse> onLoad() => GetRooms().run();
|
||||||
return GetRooms().run();
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetRoomsResponse onLocalData(String json) {
|
GetRoomsResponse onLocalData(String json) => GetRoomsResponse.fromJson(jsonDecode(json));
|
||||||
return GetRoomsResponse.fromJson(jsonDecode(json));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -26,4 +26,4 @@ class GetRoomsResponseObject {
|
|||||||
|
|
||||||
factory GetRoomsResponseObject.fromJson(Map<String, dynamic> json) => _$GetRoomsResponseObjectFromJson(json);
|
factory GetRoomsResponseObject.fromJson(Map<String, dynamic> json) => _$GetRoomsResponseObjectFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$GetRoomsResponseObjectToJson(this);
|
Map<String, dynamic> toJson() => _$GetRoomsResponseObjectToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -8,7 +8,7 @@ class GetSubjects extends WebuntisApi {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetSubjectsResponse> run() async {
|
Future<GetSubjectsResponse> run() async {
|
||||||
String rawAnswer = await query(this);
|
var rawAnswer = await query(this);
|
||||||
return finalize(GetSubjectsResponse.fromJson(jsonDecode(rawAnswer)));
|
return finalize(GetSubjectsResponse.fromJson(jsonDecode(rawAnswer)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -6,17 +6,13 @@ import 'getSubjectsResponse.dart';
|
|||||||
|
|
||||||
class GetSubjectsCache extends RequestCache<GetSubjectsResponse> {
|
class GetSubjectsCache extends RequestCache<GetSubjectsResponse> {
|
||||||
GetSubjectsCache({onUpdate}) : super(RequestCache.cacheHour, onUpdate) {
|
GetSubjectsCache({onUpdate}) : super(RequestCache.cacheHour, onUpdate) {
|
||||||
start('MarianumMobile', 'wu-subjects');
|
start('wu-subjects');
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetSubjectsResponse> onLoad() {
|
Future<GetSubjectsResponse> onLoad() => GetSubjects().run();
|
||||||
return GetSubjects().run();
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
onLocalData(String json) {
|
onLocalData(String json) => GetSubjectsResponse.fromJson(jsonDecode(json));
|
||||||
return GetSubjectsResponse.fromJson(jsonDecode(json));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -26,4 +26,4 @@ class GetSubjectsResponseObject {
|
|||||||
|
|
||||||
factory GetSubjectsResponseObject.fromJson(Map<String, dynamic> json) => _$GetSubjectsResponseObjectFromJson(json);
|
factory GetSubjectsResponseObject.fromJson(Map<String, dynamic> json) => _$GetSubjectsResponseObjectFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$GetSubjectsResponseObjectToJson(this);
|
Map<String, dynamic> toJson() => _$GetSubjectsResponseObjectToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -11,8 +11,8 @@ class GetTimetable extends WebuntisApi {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetTimetableResponse> run() async {
|
Future<GetTimetableResponse> run() async {
|
||||||
String rawAnswer = await query(this);
|
var rawAnswer = await query(this);
|
||||||
return finalize(GetTimetableResponse.fromJson(jsonDecode(rawAnswer)));
|
return finalize(GetTimetableResponse.fromJson(jsonDecode(rawAnswer)));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -11,17 +11,14 @@ class GetTimetableCache extends RequestCache<GetTimetableResponse> {
|
|||||||
int enddate;
|
int enddate;
|
||||||
|
|
||||||
GetTimetableCache({required onUpdate, onError, required this.startdate, required this.enddate}) : super(RequestCache.cacheMinute, onUpdate, onError: onError) {
|
GetTimetableCache({required onUpdate, onError, required this.startdate, required this.enddate}) : super(RequestCache.cacheMinute, onUpdate, onError: onError) {
|
||||||
start('MarianumMobile', 'wu-timetable-$startdate-$enddate');
|
start('wu-timetable-$startdate-$enddate');
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
GetTimetableResponse onLocalData(String json) {
|
GetTimetableResponse onLocalData(String json) => GetTimetableResponse.fromJson(jsonDecode(json));
|
||||||
return GetTimetableResponse.fromJson(jsonDecode(json));
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<GetTimetableResponse> onLoad() async {
|
Future<GetTimetableResponse> onLoad() async => GetTimetable(
|
||||||
return GetTimetable(
|
|
||||||
GetTimetableParams(
|
GetTimetableParams(
|
||||||
options: GetTimetableParamsOptions(
|
options: GetTimetableParamsOptions(
|
||||||
element: GetTimetableParamsOptionsElement(
|
element: GetTimetableParamsOptionsElement(
|
||||||
@@ -38,5 +35,4 @@ class GetTimetableCache extends RequestCache<GetTimetableResponse> {
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
).run();
|
).run();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
@@ -91,4 +91,4 @@ enum GetTimetableParamsOptionsElementKeyType {
|
|||||||
@JsonValue('id') id,
|
@JsonValue('id') id,
|
||||||
@JsonValue('name') name,
|
@JsonValue('name') name,
|
||||||
@JsonValue('externalkey') externalkey
|
@JsonValue('externalkey') externalkey
|
||||||
}
|
}
|
||||||
|
@@ -136,4 +136,4 @@ class GetTimetableResponseObjectRoom {
|
|||||||
|
|
||||||
factory GetTimetableResponseObjectRoom.fromJson(Map<String, dynamic> json) => _$GetTimetableResponseObjectRoomFromJson(json);
|
factory GetTimetableResponseObjectRoom.fromJson(Map<String, dynamic> json) => _$GetTimetableResponseObjectRoomFromJson(json);
|
||||||
Map<String, dynamic> toJson() => _$GetTimetableResponseObjectRoomToJson(this);
|
Map<String, dynamic> toJson() => _$GetTimetableResponseObjectRoomToJson(this);
|
||||||
}
|
}
|
||||||
|
@@ -20,13 +20,13 @@ abstract class WebuntisApi extends ApiRequest {
|
|||||||
|
|
||||||
|
|
||||||
Future<String> query(WebuntisApi untis) async {
|
Future<String> query(WebuntisApi untis) async {
|
||||||
String query = '{"id":"ID","method":"$method","params":${untis._body()},"jsonrpc":"2.0"}';
|
var query = '{"id":"ID","method":"$method","params":${untis._body()},"jsonrpc":"2.0"}';
|
||||||
|
|
||||||
String sessionId = '0';
|
var sessionId = '0';
|
||||||
if(authenticatedResponse) {
|
if(authenticatedResponse) {
|
||||||
sessionId = (await Authenticate.getSession()).sessionId;
|
sessionId = (await Authenticate.getSession()).sessionId;
|
||||||
}
|
}
|
||||||
http.Response data = await post(query, {'Cookie': 'JSESSIONID=$sessionId'});
|
var data = await post(query, {'Cookie': 'JSESSIONID=$sessionId'});
|
||||||
response = data;
|
response = data;
|
||||||
|
|
||||||
dynamic jsonData = jsonDecode(data.body);
|
dynamic jsonData = jsonDecode(data.body);
|
||||||
@@ -48,16 +48,12 @@ abstract class WebuntisApi extends ApiRequest {
|
|||||||
|
|
||||||
Future<ApiResponse> run();
|
Future<ApiResponse> run();
|
||||||
|
|
||||||
String _body() {
|
String _body() => genericParam == null ? '{}' : jsonEncode(genericParam);
|
||||||
return genericParam == null ? '{}' : jsonEncode(genericParam);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<http.Response> post(String data, Map<String, String>? headers) async {
|
Future<http.Response> post(String data, Map<String, String>? headers) async => await http
|
||||||
return await http
|
|
||||||
.post(endpoint, body: data, headers: headers)
|
.post(endpoint, body: data, headers: headers)
|
||||||
.timeout(
|
.timeout(
|
||||||
const Duration(seconds: 10),
|
const Duration(seconds: 10),
|
||||||
onTimeout: () => throw WebuntisError('Timeout', 1)
|
onTimeout: () => throw WebuntisError('Timeout', 1)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user