|
@@ -27,9 +27,6 @@ import android.annotation.SuppressLint;
|
|
import android.app.Activity;
|
|
import android.app.Activity;
|
|
import android.app.NotificationChannel;
|
|
import android.app.NotificationChannel;
|
|
import android.app.NotificationManager;
|
|
import android.app.NotificationManager;
|
|
-import android.app.Service;
|
|
|
|
-import android.content.BroadcastReceiver;
|
|
|
|
-import android.content.ContentProvider;
|
|
|
|
import android.content.ContentResolver;
|
|
import android.content.ContentResolver;
|
|
import android.content.Context;
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.content.Intent;
|
|
@@ -91,15 +88,10 @@ import androidx.annotation.RequiresApi;
|
|
import androidx.annotation.StringRes;
|
|
import androidx.annotation.StringRes;
|
|
import androidx.appcompat.app.AlertDialog;
|
|
import androidx.appcompat.app.AlertDialog;
|
|
import androidx.core.util.Pair;
|
|
import androidx.core.util.Pair;
|
|
-import androidx.fragment.app.Fragment;
|
|
|
|
import androidx.multidex.MultiDexApplication;
|
|
import androidx.multidex.MultiDexApplication;
|
|
import dagger.android.AndroidInjector;
|
|
import dagger.android.AndroidInjector;
|
|
import dagger.android.DispatchingAndroidInjector;
|
|
import dagger.android.DispatchingAndroidInjector;
|
|
-import dagger.android.HasActivityInjector;
|
|
|
|
-import dagger.android.HasBroadcastReceiverInjector;
|
|
|
|
-import dagger.android.HasContentProviderInjector;
|
|
|
|
-import dagger.android.HasServiceInjector;
|
|
|
|
-import dagger.android.support.HasSupportFragmentInjector;
|
|
|
|
|
|
+import dagger.android.HasAndroidInjector;
|
|
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
|
|
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
|
|
|
|
|
|
import static com.owncloud.android.ui.activity.ContactsPreferenceActivity.PREFERENCE_CONTACTS_AUTOMATIC_BACKUP;
|
|
import static com.owncloud.android.ui.activity.ContactsPreferenceActivity.PREFERENCE_CONTACTS_AUTOMATIC_BACKUP;
|
|
@@ -110,12 +102,7 @@ import static com.owncloud.android.ui.activity.ContactsPreferenceActivity.PREFER
|
|
* <p>
|
|
* <p>
|
|
* Contains methods to build the "static" strings. These strings were before constants in different classes
|
|
* Contains methods to build the "static" strings. These strings were before constants in different classes
|
|
*/
|
|
*/
|
|
-public class MainApp extends MultiDexApplication implements
|
|
|
|
- HasActivityInjector,
|
|
|
|
- HasSupportFragmentInjector,
|
|
|
|
- HasServiceInjector,
|
|
|
|
- HasContentProviderInjector,
|
|
|
|
- HasBroadcastReceiverInjector {
|
|
|
|
|
|
+public class MainApp extends MultiDexApplication implements HasAndroidInjector {
|
|
|
|
|
|
public static final OwnCloudVersion OUTDATED_SERVER_VERSION = OwnCloudVersion.nextcloud_13;
|
|
public static final OwnCloudVersion OUTDATED_SERVER_VERSION = OwnCloudVersion.nextcloud_13;
|
|
public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_12;
|
|
public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_12;
|
|
@@ -132,19 +119,7 @@ public class MainApp extends MultiDexApplication implements
|
|
protected AppPreferences preferences;
|
|
protected AppPreferences preferences;
|
|
|
|
|
|
@Inject
|
|
@Inject
|
|
- protected DispatchingAndroidInjector<Activity> dispatchingActivityInjector;
|
|
|
|
-
|
|
|
|
- @Inject
|
|
|
|
- protected DispatchingAndroidInjector<Fragment> dispatchingFragmentInjector;
|
|
|
|
-
|
|
|
|
- @Inject
|
|
|
|
- protected DispatchingAndroidInjector<Service> dispatchingServiceInjector;
|
|
|
|
-
|
|
|
|
- @Inject
|
|
|
|
- protected DispatchingAndroidInjector<ContentProvider> dispatchingContentProviderInjector;
|
|
|
|
-
|
|
|
|
- @Inject
|
|
|
|
- protected DispatchingAndroidInjector<BroadcastReceiver> dispatchingBroadcastReceiverInjector;
|
|
|
|
|
|
+ protected DispatchingAndroidInjector<Object> dispatchingAndroidInjector;
|
|
|
|
|
|
@Inject
|
|
@Inject
|
|
protected UserAccountManager accountManager;
|
|
protected UserAccountManager accountManager;
|
|
@@ -732,27 +707,8 @@ public class MainApp extends MultiDexApplication implements
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public AndroidInjector<Activity> activityInjector() {
|
|
|
|
- return dispatchingActivityInjector;
|
|
|
|
|
|
+ public AndroidInjector<Object> androidInjector() {
|
|
|
|
+ return dispatchingAndroidInjector;
|
|
}
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
|
- public AndroidInjector<Fragment> supportFragmentInjector() {
|
|
|
|
- return dispatchingFragmentInjector;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- @Override
|
|
|
|
- public AndroidInjector<Service> serviceInjector() {
|
|
|
|
- return dispatchingServiceInjector;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- @Override
|
|
|
|
- public AndroidInjector<ContentProvider> contentProviderInjector() {
|
|
|
|
- return dispatchingContentProviderInjector;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- @Override
|
|
|
|
- public AndroidInjector<BroadcastReceiver> broadcastReceiverInjector() {
|
|
|
|
- return dispatchingBroadcastReceiverInjector;
|
|
|
|
- }
|
|
|
|
}
|
|
}
|