Fix bug about duplicated requirement intents.

For example when navigating to the UserProfileActivity, the user would be prompted to login twice. This fixes that issue. Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
DivisionBy-Zero · Dec 17, 2018 · d65ea3f · d65ea3f
1 parent b306a79
commit d65ea3f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/src/main/java/ch/epfl/sweng/erpa/activities/DependencyConfigurationAgnosticActivity.java b/app/src/main/java/ch/epfl/sweng/erpa/activities/DependencyConfigurationAgnosticActivity.java
@@ -45,6 +45,7 @@ private void enqueueAndFinishIfUnconfiguredDependencies() {
                     .orElseThrow(() -> new IllegalArgumentException(
                         "Cannot find Configurator for class " + depCls.getName())))
                 .map(DependencyCoordinator::dependencyConfigurationIntent)
+                .distinct()
                 .map(i -> i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_TASK_ON_HOME))
                 .collect(Collectors.toList());
 

diff --git a/app/src/main/java/ch/epfl/sweng/erpa/operations/LoggedUserCoordinator.java b/app/src/main/java/ch/epfl/sweng/erpa/operations/LoggedUserCoordinator.java
@@ -28,8 +28,10 @@ public class LoggedUserCoordinator implements DependencyCoordinator<LoggedUser>
     @Inject Context ctx;
     @Inject UserManagementService ups;
     private Optional<LoggedUser> currentLoggedUser = Optional.empty();
+    private final Intent configurationIntent;
 
-    @Inject public LoggedUserCoordinator() {
+    @Inject public LoggedUserCoordinator(Context ctx) {
+        configurationIntent = new Intent(ctx, LoginActivity.class);
     }
 
     private static <A> Consumer<A> failIfNull(String message, Consumer<A> next) {
@@ -41,7 +43,7 @@ private static <A> Consumer<A> failIfNull(String message, Consumer<A> next) {
     }
 
     @Override public Intent dependencyConfigurationIntent() {
-        return new Intent(ctx, LoginActivity.class);
+        return configurationIntent;
     }
 
     public void setCurrentLoggedUser(LoggedUser up) {

diff --git a/app/src/main/java/ch/epfl/sweng/erpa/operations/RemoteServicesProviderCoordinator.java b/app/src/main/java/ch/epfl/sweng/erpa/operations/RemoteServicesProviderCoordinator.java
@@ -45,13 +45,15 @@ public class RemoteServicesProviderCoordinator implements DependencyCoordinator<
     @Inject SharedPreferences sharedPreferences;
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     private Optional<RemoteServicesProvider> currentProvider = Optional.empty();
+    private final Intent configurationIntent;
 
     @Inject
     public RemoteServicesProviderCoordinator(@Named(ErpaApplication.RES_APPLICATION_SCOPE) Scope scope, Context appCtx) {
         this.applicationContext = appCtx;
         Toothpick.inject(this, scope);
         REMOTE_PROVIDER_KEY = appCtx.getString(R.string.prop_key_remote_provider);
         rspClassFromApplicationPreferences().ifPresent(this::bindRemoteServicesProvider);
+        configurationIntent = new Intent(applicationContext, SelectRemoteServicesProviderActivity.class);
     }
 
     public void bindRemoteServicesProvider(@Nullable Class<? extends RemoteServicesProvider> rspClass) {
@@ -107,7 +109,7 @@ public boolean dependencyIsConfigured() {
 
     @Override
     public Intent dependencyConfigurationIntent() {
-        return new Intent(applicationContext, SelectRemoteServicesProviderActivity.class);
+        return configurationIntent;
     }
 
     @Override