Skip to content
This repository was archived by the owner on Jul 24, 2023. It is now read-only.

Commit ff0de4b

Browse files
nerdyverdeiainmcgin
authored andcommitted
Updated CredentialClient to utilize ProviderResolver methods (#143)
* Updated CredentialClient to utilize ProviderResolver methods * Fixed import order to pass checkstyle
1 parent 49e6117 commit ff0de4b

1 file changed

Lines changed: 6 additions & 21 deletions

File tree

api/java/org/openyolo/api/CredentialClient.java

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import android.content.ComponentName;
3232
import android.content.Context;
3333
import android.content.Intent;
34-
import android.content.pm.ResolveInfo;
3534
import android.support.annotation.NonNull;
3635
import android.support.annotation.Nullable;
3736
import android.support.annotation.VisibleForTesting;
@@ -44,6 +43,7 @@
4443
import org.openyolo.api.internal.FinishWithResultActivity;
4544
import org.openyolo.api.internal.KnownProviders;
4645
import org.openyolo.api.internal.ProviderPickerActivity;
46+
import org.openyolo.api.internal.ProviderResolver;
4747
import org.openyolo.api.persistence.AppSettings;
4848
import org.openyolo.api.persistence.internal.AppSettingsImpl;
4949
import org.openyolo.protocol.Credential;
@@ -213,7 +213,8 @@ public Intent getCredentialRetrieveIntent(CredentialRetrieveRequest request) {
213213
*/
214214
@NonNull
215215
public Intent getHintRetrieveIntent(final HintRetrieveRequest request) {
216-
List<ComponentName> hintProviders = findProviders(HINT_CREDENTIAL_ACTION);
216+
List<ComponentName> hintProviders =
217+
ProviderResolver.findProviders(mApplicationContext, HINT_CREDENTIAL_ACTION);
217218

218219
if (hintProviders.isEmpty()) {
219220
ActivityResult result = ActivityResult.of(
@@ -282,7 +283,8 @@ public Intent getSaveIntent(final Credential credential) {
282283
*/
283284
@NonNull
284285
public Intent getSaveIntent(final CredentialSaveRequest saveRequest) {
285-
List<ComponentName> saveProviders = findProviders(SAVE_CREDENTIAL_ACTION);
286+
List<ComponentName> saveProviders =
287+
ProviderResolver.findProviders(mApplicationContext, SAVE_CREDENTIAL_ACTION);
286288

287289
if (saveProviders.isEmpty()) {
288290
ActivityResult result = ActivityResult.of(
@@ -360,7 +362,7 @@ public Intent getDeleteIntent(@NonNull CredentialDeleteRequest request) {
360362
require(request, notNullValue());
361363

362364
List<ComponentName> deleteProviders =
363-
findProviders(DELETE_CREDENTIAL_ACTION);
365+
ProviderResolver.findProviders(mApplicationContext, DELETE_CREDENTIAL_ACTION);
364366

365367
if (deleteProviders.isEmpty()) {
366368
ActivityResult result = ActivityResult.of(
@@ -632,23 +634,6 @@ public void disableAutoSignIn() {
632634
mDeviceState.setIsAutoSignInDisabled(true);
633635
}
634636

635-
private List<ComponentName> findProviders(@NonNull String action) {
636-
Intent saveIntent = new Intent(action);
637-
saveIntent.addCategory(OPENYOLO_CATEGORY);
638-
639-
List<ResolveInfo> resolveInfos =
640-
mApplicationContext.getPackageManager().queryIntentActivities(saveIntent, 0);
641-
642-
ArrayList<ComponentName> responders = new ArrayList<>();
643-
for (ResolveInfo info : resolveInfos) {
644-
responders.add(new ComponentName(
645-
info.activityInfo.packageName,
646-
info.activityInfo.name));
647-
}
648-
649-
return responders;
650-
}
651-
652637
@Nullable
653638
private ComponentName getPreferredProvider(@NonNull List<ComponentName> providers) {
654639
// In the future, the user will be able to explicitly set their preferred provider in

0 commit comments

Comments
 (0)