AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Removed auth factory

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2021-03-13 09:51:12 +01:00 • committed by Roman Tsisyk
parent dd75c69e04
commit 218916bd51
14 changed files with 18 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -41,7 +41,6 @@ import com.mapswithme.maps.base.BaseMwmFragmentActivity;
import com.mapswithme.maps.base.CustomNavigateUpListener;
import com.mapswithme.maps.base.NoConnectionListener;
import com.mapswithme.maps.base.OnBackPressListener;
import com.mapswithme.maps.bookmarks.AuthBundleFactory;
import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity;
import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity;
import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
@ -2724,8 +2723,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
public void onGalleryGuideSelected(@NonNull String url)
{
BookmarksCatalogActivity.startForResult(
this, BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY, url,
AuthBundleFactory.guideCatalogue());
this, BookmarkCategoriesActivity.REQ_CODE_DOWNLOAD_BOOKMARK_CATEGORY, url);
}
private void toggleLayer(@NonNull Mode mode)

3
android/src/com/mapswithme/maps/auth/Authorizer.java
View file

@ -57,7 +57,7 @@ public class Authorizer implements AuthorizationListener
mCallback = null;
}
public final void authorize(@NonNull Bundle bundle)
public final void authorize()
{
if (isAuthorized())
{
@ -73,7 +73,6 @@ public class Authorizer implements AuthorizationListener
return;
fragment = (DialogFragment) Fragment.instantiate(mFragment.getContext(), name);
fragment.setArguments(bundle);
// A communication with the SocialAuthDialogFragment is implemented via getParentFragment method
// because of 'setTargetFragment' paradigm doesn't survive the activity configuration change
// due to this issue https://issuetracker.google.com/issues/36969568

2
android/src/com/mapswithme/maps/auth/PassportAuthDialogFragment.java
View file

@ -36,7 +36,7 @@ public class PassportAuthDialogFragment extends BaseMwmDialogFragment
super.onStart();
mAuthorizer.attach(mAuthCallback);
if (mSavedInstanceState == null)
mAuthorizer.authorize(getArgumentsOrThrow());
mAuthorizer.authorize();
}
@Override

5
android/src/com/mapswithme/maps/base/BaseAuthFragment.java
View file

@ -9,7 +9,6 @@ import androidx.annotation.Nullable;
import com.mapswithme.maps.auth.Authorizer;
import com.mapswithme.maps.auth.TargetFragmentCallback;
import com.mapswithme.maps.bookmarks.AuthBundleFactory;
public abstract class BaseAuthFragment extends BaseAsyncOperationFragment
implements Authorizer.Callback, TargetFragmentCallback
@ -17,9 +16,9 @@ public abstract class BaseAuthFragment extends BaseAsyncOperationFragment
@NonNull
private final Authorizer mAuthorizer = new Authorizer(this);
protected final void authorize(@NonNull Bundle bundle)
protected final void authorize()
{
mAuthorizer.authorize(bundle);
mAuthorizer.authorize();
}
@Override

4
android/src/com/mapswithme/maps/base/BaseToolbarAuthFragment.java
View file

@ -21,9 +21,9 @@ public abstract class BaseToolbarAuthFragment extends BaseMwmToolbarFragment
@NonNull
private final Authorizer mAuthorizer = new Authorizer(this);
protected final void authorize(@NonNull Bundle bundle)
protected final void authorize()
{
mAuthorizer.authorize(bundle);
mAuthorizer.authorize();
}
@Override

46
android/src/com/mapswithme/maps/bookmarks/AuthBundleFactory.java
View file

@ -1,46 +0,0 @@
package com.mapswithme.maps.bookmarks;
import android.os.Bundle;
import androidx.annotation.NonNull;
public class AuthBundleFactory
{
@NonNull
public static Bundle saveReview()
{
return buildBundle(Statistics.EventParam.AFTER_SAVE_REVIEW);
}
@NonNull
public static Bundle bookmarksBackup()
{
return buildBundle(Statistics.EventParam.BOOKMARKS_BACKUP);
}
@NonNull
public static Bundle guideCatalogue()
{
return buildBundle(Statistics.EventParam.GUIDE_CATALOGUE);
}
@NonNull
public static Bundle subscription()
{
return buildBundle(Statistics.EventParam.SUBSCRIPTION);
}
@NonNull
public static Bundle exportBookmarks()
{
return buildBundle(Statistics.EventParam.EXPORT_BOOKMARKS);
}
@NonNull
private static Bundle buildBundle(@NonNull String value)
{
Bundle bundle = new Bundle();
bundle.putString(Statistics.EventParam.FROM, value);
return bundle;
}
}

2
android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java
View file

@ -57,7 +57,7 @@ public class BookmarkBackupController implements Authorizer.Callback,
@Override
public void onClick(View v)
{
mAuthorizer.authorize(AuthBundleFactory.bookmarksBackup());
mAuthorizer.authorize();
}
};
@NonNull

18
android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java
View file

@ -18,30 +18,20 @@ public class BookmarksCatalogActivity extends BaseToolbarActivity
public static void startForResult(@NonNull Fragment fragment, int requestCode,
@NonNull String catalogUrl)
{
fragment.startActivityForResult(makeLaunchIntent(fragment.requireContext(), catalogUrl,
AuthBundleFactory.guideCatalogue()),
fragment.startActivityForResult(makeLaunchIntent(fragment.requireContext(), catalogUrl),
requestCode);
}
public static void startForResult(@NonNull Activity context, int requestCode,
@NonNull String catalogUrl)
public static void startForResult(@NonNull Activity context, int requestCode, @NonNull String catalogUrl)
{
startForResult(context, requestCode, catalogUrl, AuthBundleFactory.guideCatalogue());
}
public static void startForResult(@NonNull Activity context, int requestCode,
@NonNull String catalogUrl, @NonNull Bundle bundle)
{
context.startActivityForResult(makeLaunchIntent(context, catalogUrl, bundle), requestCode);
context.startActivityForResult(makeLaunchIntent(context, catalogUrl), requestCode);
}
@NonNull
private static Intent makeLaunchIntent(@NonNull Context context, @NonNull String catalogUrl,
@NonNull Bundle bundle)
private static Intent makeLaunchIntent(@NonNull Context context, @NonNull String catalogUrl)
{
return new Intent(context, BookmarksCatalogActivity.class)
.putExtra(BookmarksCatalogFragment.EXTRA_BOOKMARKS_CATALOG_URL, catalogUrl)
.putExtra(EXTRA_ARGS, bundle)
.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
}

4
android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java
View file

@ -117,9 +117,7 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment
public void onCreate(@Nullable Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
Bundle extra = requireActivity().getIntent()
.getBundleExtra(BookmarksCatalogActivity.EXTRA_ARGS);
mDelegate = new BookmarksDownloadFragmentDelegate(this, extra, mAuthorizationListener);
mDelegate = new BookmarksDownloadFragmentDelegate(this, mAuthorizationListener);
mDelegate.onCreate(savedInstanceState);
mInvalidSubsDialogCallback = new InvalidSubscriptionAlertDialogCallback(this);
}

8
android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadFragmentDelegate.java
View file

@ -52,21 +52,17 @@ class BookmarksDownloadFragmentDelegate implements Authorizer.Callback, Bookmark
private final AuthorizationListener mAuthorizationListener;
@NonNull
private final ExpiredCategoriesListener mExpiredCategoriesListener;
@NonNull
private final Bundle mBundle;
BookmarksDownloadFragmentDelegate(@NonNull Fragment fragment)
{
this(fragment, AuthBundleFactory.guideCatalogue(), null);
this(fragment, null);
}
BookmarksDownloadFragmentDelegate(@NonNull Fragment fragment,
@NonNull Bundle bundle,
@Nullable AuthorizationListener authorizationListener)
{
mFragment = fragment;
mExpiredCategoriesListener = new ExpiredCategoriesListener(fragment);
mBundle = bundle;
mAuthorizationListener = authorizationListener;
}
@ -246,7 +242,7 @@ class BookmarksDownloadFragmentDelegate implements Authorizer.Callback, Bookmark
void authorize(@NonNull Runnable completionRunnable)
{
mAuthCompletionRunnable = completionRunnable;
mAuthorizer.authorize(mBundle);
mAuthorizer.authorize();
}
private static class ExpiredCategoriesListener implements BookmarkManager.BookmarksExpiredCategoriesListener, Detachable<Fragment>

6
android/src/com/mapswithme/maps/purchase/AbstractBookmarkSubscriptionFragment.java
View file

@ -15,7 +15,6 @@ import com.android.billingclient.api.SkuDetails;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseAuthFragment;
import com.mapswithme.maps.bookmarks.AuthBundleFactory;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.dialog.AlertDialog;
import com.mapswithme.maps.dialog.AlertDialogCallback;
@ -99,11 +98,6 @@ abstract class AbstractBookmarkSubscriptionFragment extends BaseAuthFragment
activateState(BookmarkSubscriptionPaymentState.CHECK_NETWORK_CONNECTION);
}
protected void authorize()
{
authorize(AuthBundleFactory.subscription());
}
@Override
public final void onDestroyView()
{

3
android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java
View file

@ -15,7 +15,6 @@ import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseToolbarAuthFragment;
import com.mapswithme.maps.background.Notifier;
import com.mapswithme.maps.bookmarks.AuthBundleFactory;
import com.mapswithme.maps.bookmarks.data.FeatureId;
import com.mapswithme.maps.metrics.UserActionsLogger;
import com.mapswithme.maps.widget.ToolbarController;
@ -127,7 +126,7 @@ public class UGCEditorFragment extends BaseToolbarAuthFragment
finishActivity();
return;
}
authorize(AuthBundleFactory.saveReview());
authorize();
});
}

3
android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderFragment.java
View file

@ -11,7 +11,6 @@ import android.view.ViewGroup;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseAuthFragment;
import com.mapswithme.maps.bookmarks.AuthBundleFactory;
import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.bookmarks.data.CatalogCustomProperty;
@ -105,7 +104,7 @@ public class SendLinkPlaceholderFragment extends BaseAuthFragment implements Boo
if (uploadResult == BookmarkManager.UploadResult.UPLOAD_RESULT_SUCCESS)
onUploadSucceeded();
else if (uploadResult == BookmarkManager.UploadResult.UPLOAD_RESULT_AUTH_ERROR)
authorize(AuthBundleFactory.exportBookmarks());
authorize();
else
onUploadFailed();
}

3
android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java
View file

@ -19,7 +19,6 @@ import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseToolbarAuthFragment;
import com.mapswithme.maps.base.FinishActivityToolbarController;
import com.mapswithme.maps.bookmarks.AuthBundleFactory;
import com.mapswithme.maps.bookmarks.data.AbstractCategoriesSnapshot;
import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
@ -339,7 +338,7 @@ public class UgcSharingOptionsFragment extends BaseToolbarAuthFragment implement
if (isAuthorized())
onPostAuthCompleted();
else
authorize(AuthBundleFactory.exportBookmarks());
authorize();
}
private void onPostAuthCompleted()