Merge pull request #3436 from nextcloud/refactoring/noid/removeConductor

Remove conductor
nextcloud · Nov 23, 2023 · 3ad2ec5 · 3ad2ec5
2 parents 074fc30 + 0634dbd
commit 3ad2ec5
Show file tree

Hide file tree

Showing 50 changed files with 832 additions and 1,402 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -289,7 +289,6 @@ We are using [Dagger 2](https://dagger.dev/) to inject dependencies into major A
 
  * `Activity`
  * `Fragment`
- * `Controller`
  * `Service`
  * `BroadcastReceiver`
  * `ContentProvider`

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@
  * @author Tim Krüger
  * Copyright (C) 2021 Andy Scherzinger <[email protected]>
  * Copyright (C) 2017-2019 Mario Danic <[email protected]>
- * Copyright (C) 2021 Marcel Hibbe <[email protected]>
+ * Copyright (C) 2021-2023 Marcel Hibbe <[email protected]>
  * Copyright (C) 2022 Tim Krüger <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -210,8 +210,6 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation "io.reactivex.rxjava2:rxjava:2.2.21"
 
-    implementation 'com.bluelinelabs:conductor:3.2.0'
-
     implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
     implementation "com.squareup.okhttp3:okhttp-urlconnection:${okhttpVersion}"
     implementation "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"

diff --git a/app/lint.xml b/app/lint.xml
@@ -32,6 +32,5 @@
 
     <issue id="ObsoleteLintCustomCheck" severity="warning">
         <ignore path="**/jetified-annotation-experimental-1.**/**/lint.jar" />
-        <ignore path="**/jetified-conductor-2.**/**/lint.jar" />
     </issue>
 </lint>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
   ~ @author Mario Danic
   ~ @author Marcel Hibbe
   ~ Copyright (C) 2017-2019 Mario Danic <[email protected]>
-  ~ Copyright (C) 2021-2022 Marcel Hibbe <[email protected]>
+  ~ Copyright (C) 2021-2023 Marcel Hibbe <[email protected]>
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -131,6 +131,44 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".account.ServerSelectionActivity"
+            android:theme="@style/AppTheme" />
+
+        <activity
+            android:name=".account.WebViewLoginActivity"
+            android:theme="@style/AppTheme" />
+
+        <activity
+            android:name=".account.AccountVerificationActivity"
+            android:theme="@style/AppTheme" />
+
+        <activity
+            android:name=".account.SwitchAccountActivity"
+            android:theme="@style/AppTheme" />
+
+        <activity
+            android:name=".conversationlist.ConversationsListActivity"
+            android:theme="@style/AppTheme"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".chat.ChatActivity"
+            android:theme="@style/AppTheme" />
+
         <activity
             android:name=".activities.CallActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
@@ -215,32 +253,10 @@
             android:name=".contacts.ContactsActivity"
             android:theme="@style/AppTheme" />
 
-        <activity
-            android:name=".chat.ChatActivity"
-            android:theme="@style/AppTheme" />
-
         <activity
             android:name=".openconversations.ListOpenConversationsActivity"
             android:theme="@style/AppTheme" />
 
-        <activity
-            android:name=".conversationlist.ConversationsListActivity"
-            android:theme="@style/AppTheme"
-            android:exported="true">
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="*/*" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="*/*" />
-            </intent-filter>
-        </activity>
-
         <activity
             android:name=".lock.LockedActivity"
             android:theme="@style/AppTheme" />