Changed application id, fixed network address lookup in login page

astubenbord · Nov 2, 2022 · 2f2312d · 2f2312d
1 parent 3515915
commit 2f2312d
Show file tree

Hide file tree

Showing 127 changed files with 662 additions and 684 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -43,7 +43,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "de.antonjstu.flutter_paperless_mobile"
+        applicationId "de.astubenbord.paperless_mobile"
         minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_paperless_mobile">
+    package="com.example.paperless_mobile">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.flutter_paperless_mobile">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.paperless_mobile">
     <application android:label="Paperless Mobile" android:name="${applicationName}" android:icon="@mipmap/launcher_icon">
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as

diff --git a/android/app/src/main/kotlin/com/example/flutter_paperless_ng_scan_and_share/MainActivity.kt b/android/app/src/main/kotlin/com/example/flutter_paperless_ng_scan_and_share/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.flutter_paperless_mobile
+package com.example.paperless_mobile
 
 import android.os.Bundle
 import android.view.WindowManager.LayoutParams

diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_paperless_mobile">
+    package="com.example.paperless_mobile">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -15,7 +15,7 @@
 		<key>CFBundleInfoDictionaryVersion</key>
 		<string>6.0</string>
 		<key>CFBundleName</key>
-		<string>flutter_paperless_mobile</string>
+		<string>paperless_mobile</string>
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>

diff --git a/lib/core/bloc/connectivity_cubit.dart b/lib/core/bloc/connectivity_cubit.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/service/connectivity_status.service.dart';
+import 'package:paperless_mobile/core/service/connectivity_status.service.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton

diff --git a/lib/core/bloc/document_status_cubit.dart b/lib/core/bloc/document_status_cubit.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/core/model/document_processing_status.dart';
+import 'package:paperless_mobile/core/model/document_processing_status.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton

diff --git a/lib/core/bloc/label_bloc_provider.dart b/lib/core/bloc/label_bloc_provider.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
-import 'package:flutter_paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/bloc/saved_view_cubit.dart';
+import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart';
+import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart';
+import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart';
+import 'package:paperless_mobile/features/labels/tags/bloc/tags_cubit.dart';
 
 class LabelBlocProvider extends StatelessWidget {
   final Widget child;

diff --git a/lib/core/bloc/label_cubit.dart b/lib/core/bloc/label_cubit.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/labels/model/label.model.dart';
-import 'package:flutter_paperless_mobile/features/labels/repository/label_repository.dart';
+import 'package:paperless_mobile/features/labels/model/label.model.dart';
+import 'package:paperless_mobile/features/labels/repository/label_repository.dart';
 
 abstract class LabelCubit<T extends Label> extends Cubit<Map<int, T>> {
   final LabelRepository labelRepository;

diff --git a/lib/core/interceptor/authentication.interceptor.dart b/lib/core/interceptor/authentication.interceptor.dart
@@ -1,8 +1,8 @@
 import 'dart:developer';
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/features/login/bloc/authentication_cubit.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/features/login/bloc/authentication_cubit.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:injectable/injectable.dart';
 

diff --git a/lib/core/interceptor/connection_state.interceptor.dart b/lib/core/interceptor/connection_state.interceptor.dart
@@ -1,31 +1,27 @@
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/service/connectivity_status.service.dart';
-import 'package:flutter_paperless_mobile/features/login/bloc/authentication_cubit.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/service/connectivity_status.service.dart';
+import 'package:paperless_mobile/features/login/bloc/authentication_cubit.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:injectable/injectable.dart';
 
 @injectable
 class ConnectionStateInterceptor implements InterceptorContract {
   final AuthenticationCubit authenticationCubit;
   final ConnectivityStatusService connectivityStatusService;
-  ConnectionStateInterceptor(
-      this.authenticationCubit, this.connectivityStatusService);
+  ConnectionStateInterceptor(this.authenticationCubit, this.connectivityStatusService);
 
   @override
   Future<BaseRequest> interceptRequest({required BaseRequest request}) async {
     if (!(await connectivityStatusService.isConnectedToInternet())) {
       throw const ErrorMessage(ErrorCode.deviceOffline);
     }
-    final isServerReachable =
-        await connectivityStatusService.isServerReachable(request.url.origin);
+    final isServerReachable = await connectivityStatusService.isServerReachable(request.url.origin);
     if (!isServerReachable) {
       throw const ErrorMessage(ErrorCode.serverUnreachable);
     }
     return request;
   }
 
   @override
-  Future<BaseResponse> interceptResponse(
-          {required BaseResponse response}) async =>
-      response;
+  Future<BaseResponse> interceptResponse({required BaseResponse response}) async => response;
 }
diff --git a/lib/core/interceptor/language_header.interceptor.dart b/lib/core/interceptor/language_header.interceptor.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:injectable/injectable.dart';
 

diff --git a/lib/core/logic/error_code_localization_mapper.dart b/lib/core/logic/error_code_localization_mapper.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 String translateError(BuildContext context, ErrorCode code) {
   switch (code) {

diff --git a/lib/core/logic/timeout_client.dart b/lib/core/logic/timeout_client.dart
@@ -2,9 +2,9 @@ import 'dart:typed_data';
 
 import 'dart:convert';
 
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/di_initializer.dart';
 import 'package:http/http.dart';
 import 'package:injectable/injectable.dart';
 

diff --git a/lib/core/service/connectivity_status.service.dart b/lib/core/service/connectivity_status.service.dart
@@ -17,22 +17,19 @@ class ConnectivityStatusServiceImpl implements ConnectivityStatusService {
 
   @override
   Stream<bool> connectivityChanges() {
-    return connectivity.onConnectivityChanged
-        .map(_hasActiveInternetConnection)
-        .asBroadcastStream();
+    return connectivity.onConnectivityChanged.map(_hasActiveInternetConnection).asBroadcastStream();
   }
 
   @override
   Future<bool> isConnectedToInternet() async {
-    return _hasActiveInternetConnection(
-        await (Connectivity().checkConnectivity()));
+    return _hasActiveInternetConnection(await (Connectivity().checkConnectivity()));
   }
 
   @override
   Future<bool> isServerReachable(String serverAddress) async {
     try {
-      final result = await InternetAddress.lookup(
-          serverAddress.replaceAll(RegExp(r"https?://"), ""));
+      var uri = Uri.parse(serverAddress);
+      final result = await InternetAddress.lookup(uri.host);
       if (result.isNotEmpty && result.first.rawAddress.isNotEmpty) {
         return true;
       } else {

diff --git a/lib/core/service/status.service.dart b/lib/core/service/status.service.dart
@@ -1,13 +1,13 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:flutter_paperless_mobile/core/bloc/document_status_cubit.dart';
-import 'package:flutter_paperless_mobile/core/model/document_processing_status.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/paged_search_result.dart';
-import 'package:flutter_paperless_mobile/features/login/model/authentication_information.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/core/bloc/document_status_cubit.dart';
+import 'package:paperless_mobile/core/model/document_processing_status.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
+import 'package:paperless_mobile/features/login/model/authentication_information.dart';
+import 'package:paperless_mobile/util.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:injectable/injectable.dart';
 import 'package:web_socket_channel/io.dart';

diff --git a/lib/core/store/local_vault.dart b/lib/core/store/local_vault.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 
 import 'package:encrypted_shared_preferences/encrypted_shared_preferences.dart';
-import 'package:flutter_paperless_mobile/features/login/model/authentication_information.dart';
-import 'package:flutter_paperless_mobile/features/login/model/client_certificate.dart';
-import 'package:flutter_paperless_mobile/features/settings/model/application_settings_state.dart';
+import 'package:paperless_mobile/features/login/model/authentication_information.dart';
+import 'package:paperless_mobile/features/login/model/client_certificate.dart';
+import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton

diff --git a/lib/core/util.dart b/lib/core/util.dart
@@ -2,10 +2,10 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:flutter_paperless_mobile/core/logic/timeout_client.dart';
-import 'package:flutter_paperless_mobile/core/model/error_message.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/core/logic/timeout_client.dart';
+import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/di_initializer.dart';
 import 'package:http/http.dart';
 import 'package:path_provider/path_provider.dart';
 

diff --git a/lib/core/widgets/offline_banner.dart b/lib/core/widgets/offline_banner.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class OfflineBanner extends StatelessWidget with PreferredSizeWidget {
   const OfflineBanner({super.key});

diff --git a/lib/core/widgets/offline_widget.dart b/lib/core/widgets/offline_widget.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paperless_mobile/generated/l10n.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 
 class OfflineWidget extends StatelessWidget {
   const OfflineWidget({super.key});

diff --git a/lib/di_initializer.dart b/lib/di_initializer.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 
-import 'package:flutter_paperless_mobile/di_initializer.config.dart';
-import 'package:flutter_paperless_mobile/di_modules.dart';
-import 'package:flutter_paperless_mobile/features/login/model/client_certificate.dart';
+import 'package:paperless_mobile/di_initializer.config.dart';
+import 'package:paperless_mobile/di_modules.dart';
+import 'package:paperless_mobile/features/login/model/client_certificate.dart';
 import 'package:get_it/get_it.dart';
 import 'package:injectable/injectable.dart';
 

diff --git a/lib/di_modules.dart b/lib/di_modules.dart
@@ -3,10 +3,10 @@ import 'dart:io';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:encrypted_shared_preferences/encrypted_shared_preferences.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:flutter_paperless_mobile/core/interceptor/authentication.interceptor.dart';
-import 'package:flutter_paperless_mobile/core/interceptor/connection_state.interceptor.dart';
-import 'package:flutter_paperless_mobile/core/interceptor/language_header.interceptor.dart';
-import 'package:flutter_paperless_mobile/core/interceptor/response_conversion.interceptor.dart';
+import 'package:paperless_mobile/core/interceptor/authentication.interceptor.dart';
+import 'package:paperless_mobile/core/interceptor/connection_state.interceptor.dart';
+import 'package:paperless_mobile/core/interceptor/language_header.interceptor.dart';
+import 'package:paperless_mobile/core/interceptor/response_conversion.interceptor.dart';
 import 'package:http/http.dart';
 import 'package:http/io_client.dart';
 import 'package:http_interceptor/http/http.dart';

diff --git a/lib/features/app_intro/application_intro_slideshow.dart b/lib/features/app_intro/application_intro_slideshow.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/extensions/flutter_extensions.dart';
-import 'package:flutter_paperless_mobile/features/app_intro/widgets/biometric_authentication_intro_slide.dart';
-import 'package:flutter_paperless_mobile/features/app_intro/widgets/configuration_done_intro_slide.dart';
-import 'package:flutter_paperless_mobile/features/app_intro/widgets/welcome_intro_slide.dart';
-import 'package:flutter_paperless_mobile/features/home/view/home_page.dart';
-import 'package:flutter_paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/extensions/flutter_extensions.dart';
+import 'package:paperless_mobile/features/app_intro/widgets/biometric_authentication_intro_slide.dart';
+import 'package:paperless_mobile/features/app_intro/widgets/configuration_done_intro_slide.dart';
+import 'package:paperless_mobile/features/app_intro/widgets/welcome_intro_slide.dart';
+import 'package:paperless_mobile/features/home/view/home_page.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
 import 'package:intro_slider/intro_slider.dart';
 
 class ApplicationIntroSlideshow extends StatelessWidget {

diff --git a/lib/features/app_intro/widgets/biometric_authentication_intro_slide.dart b/lib/features/app_intro/widgets/biometric_authentication_intro_slide.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/login/services/authentication.service.dart';
-import 'package:flutter_paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
-import 'package:flutter_paperless_mobile/features/settings/model/application_settings_state.dart';
-import 'package:flutter_paperless_mobile/util.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/login/services/authentication.service.dart';
+import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
+import 'package:paperless_mobile/features/settings/model/application_settings_state.dart';
+import 'package:paperless_mobile/util.dart';
 
 class BiometricAuthenticationIntroSlide extends StatefulWidget {
   const BiometricAuthenticationIntroSlide({

diff --git a/lib/features/documents/bloc/documents_cubit.dart b/lib/features/documents/bloc/documents_cubit.dart
@@ -1,11 +1,11 @@
 import 'dart:typed_data';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/documents_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/paged_search_result.dart';
-import 'package:flutter_paperless_mobile/features/documents/repository/document_repository.dart';
+import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
+import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton

diff --git a/lib/features/documents/bloc/documents_state.dart b/lib/features/documents/bloc/documents_state.dart
@@ -1,7 +1,7 @@
 import 'package:equatable/equatable.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/document_filter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/paged_search_result.dart';
+import 'package:paperless_mobile/features/documents/model/document.model.dart';
+import 'package:paperless_mobile/features/documents/model/document_filter.dart';
+import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
 
 class DocumentsState extends Equatable {
   final bool isLoaded;

diff --git a/lib/features/documents/bloc/saved_view_cubit.dart b/lib/features/documents/bloc/saved_view_cubit.dart
@@ -1,8 +1,8 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_paperless_mobile/di_initializer.dart';
-import 'package:flutter_paperless_mobile/features/documents/bloc/saved_view_state.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/saved_view.model.dart';
-import 'package:flutter_paperless_mobile/features/documents/repository/saved_views_repository.dart';
+import 'package:paperless_mobile/di_initializer.dart';
+import 'package:paperless_mobile/features/documents/bloc/saved_view_state.dart';
+import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
+import 'package:paperless_mobile/features/documents/repository/saved_views_repository.dart';
 import 'package:injectable/injectable.dart';
 
 @singleton

diff --git a/lib/features/documents/bloc/saved_view_state.dart b/lib/features/documents/bloc/saved_view_state.dart
@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/saved_view.model.dart';
+import 'package:paperless_mobile/features/documents/model/saved_view.model.dart';
 
 class SavedViewState with EquatableMixin {
   final Map<int, SavedView> value;

diff --git a/lib/features/documents/model/bulk_edit.model.dart b/lib/features/documents/model/bulk_edit.model.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/core/type/json.dart';
 
 class BulkEditAction {
   final List<int> documents;

diff --git a/lib/features/documents/model/document.model.dart b/lib/features/documents/model/document.model.dart
@@ -1,9 +1,9 @@
 // ignore_for_file: non_constant_identifier_names
 
 import 'package:equatable/equatable.dart';
-import 'package:flutter_paperless_mobile/core/type/json.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
-import 'package:flutter_paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
+import 'package:paperless_mobile/core/type/json.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/id_query_parameter.dart';
+import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
 
 class DocumentModel extends Equatable {
   static const idKey = 'id';