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

[android] Removed network policy checking from subscription screen

Browse source
This commit is contained in:
Александр Зацепин 2020-05-07 13:58:01 +03:00 • committed by yoksnod
parent 47e09d41a8
commit 6dcb57889c
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,6 @@ import com.mapswithme.maps.dialog.AlertDialog;
import com.mapswithme.maps.dialog.AlertDialogCallback;
import com.mapswithme.maps.dialog.ResolveFragmentManagerStrategy;
import com.mapswithme.util.ConnectionState;
import com.mapswithme.util.NetworkPolicy;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
import com.mapswithme.util.statistics.Statistics;
@ -242,10 +241,12 @@ abstract class AbstractBookmarkSubscriptionFragment extends BaseAuthFragment
public void onCheckNetworkConnection()
{
if (ConnectionState.isConnected())
NetworkPolicy.checkNetworkPolicy(requireFragmentManager(),
this::onNetworkPolicyResult, true);
else
PurchaseUtils.showNoConnectionDialog(this);
{
onNetworkCheckPassed();
return;
}
PurchaseUtils.showNoConnectionDialog(this);
}
@Override
@ -260,14 +261,6 @@ abstract class AbstractBookmarkSubscriptionFragment extends BaseAuthFragment
PurchaseUtils.showPaymentFailureDialog(this, getClass().getSimpleName());
}
private void onNetworkPolicyResult(@NonNull NetworkPolicy policy)
{
if (policy.canUseNetwork())
onNetworkCheckPassed();
else
requireActivity().finish();
}
private void onNetworkCheckPassed()
{
activateState(BookmarkSubscriptionPaymentState.PRODUCT_DETAILS_LOADING);

3
android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java
View file

@ -9,8 +9,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.mapswithme.maps.R;
@SuppressWarnings("WeakerAccess")
public class BookmarkSubscriptionFragment extends AbstractBookmarkSubscriptionFragment
class BookmarkSubscriptionFragment extends AbstractBookmarkSubscriptionFragment
{
@Nullable
@Override