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

[android] Respect NetworkPolicy for edits count update

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2021-05-16 00:17:08 +02:00 • committed by Roman Tsisyk
parent 7b10fd725e
commit aed79c71df
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
android/src/com/mapswithme/maps/editor/OsmOAuth.java
View file

@ -8,8 +8,10 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.Size;
import androidx.annotation.WorkerThread;
import androidx.fragment.app.FragmentManager;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.util.NetworkPolicy;
import java.lang.ref.WeakReference;
@ -133,15 +135,21 @@ public final class OsmOAuth
private static native int nativeGetOsmChangesetsCount(String token, String secret);
@WorkerThread
public static int getOsmChangesetsCount(@NonNull Context context) {
final String token = getAuthToken(context);
final String secret = getAuthSecret(context);
final int editsCount = OsmOAuth.nativeGetOsmChangesetsCount(token, secret);
public static int getOsmChangesetsCount(@NonNull Context context, @NonNull FragmentManager fm) {
final int[] editsCount = {-1};
NetworkPolicy.checkNetworkPolicy(fm, policy -> {
if (!policy.canUseNetwork())
return;
final String token = getAuthToken(context);
final String secret = getAuthSecret(context);
editsCount[0] = OsmOAuth.nativeGetOsmChangesetsCount(token, secret);
});
final SharedPreferences prefs = MwmApplication.prefs(context);
if (editsCount < 0)
if (editsCount[0] < 0)
return prefs.getInt(PREF_OSM_CHANGESETS_COUNT, 0);
prefs.edit().putInt(PREF_OSM_CHANGESETS_COUNT, editsCount).apply();
return editsCount;
prefs.edit().putInt(PREF_OSM_CHANGESETS_COUNT, editsCount[0]).apply();
return editsCount[0];
}
}

3
android/src/com/mapswithme/maps/editor/ProfileFragment.java
View file

@ -3,7 +3,6 @@ package com.mapswithme.maps.editor;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
@ -101,7 +100,7 @@ public class ProfileFragment extends AuthFragment implements View.OnClickListene
UiUtils.hide(mAuthBlock);
// Update the number of uploaded changesets from OSM.
ThreadPool.getWorker().execute(() -> {
final int count = OsmOAuth.getOsmChangesetsCount(requireContext());
final int count = OsmOAuth.getOsmChangesetsCount(requireContext(), getParentFragmentManager());
UiThread.run(() -> mEditsSent.setText(String.valueOf(count)));
});
}