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

[android] Fixed review notes

Browse source
This commit is contained in:
Dmitry Donskoy 2019-01-10 09:07:15 +03:00 • committed by Aleksandr Zatsepin
parent b3cb20a267
commit 248975b21f
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/jni/com/mapswithme/maps/LightFramework.cpp
View file

@ -40,10 +40,10 @@ Java_com_mapswithme_maps_LightFramework_nativeMakeFeatureId(JNIEnv * env, jclass
jint featureIndex)
{
auto const featureId = FeatureParamsToString(
static_cast<uint64_t>(mwmVersion), jni::ToNativeString(env, mwmName),
static_cast<int64_t>(mwmVersion), jni::ToNativeString(env, mwmName),
static_cast<uint32_t>(featureIndex));
return static_cast<jstring>(jni::ToJavaString(env, featureId));
return jni::ToJavaString(env, featureId);
}
JNIEXPORT jobjectArray JNICALL

9
android/src/com/mapswithme/maps/LightFramework.java
View file

@ -21,8 +21,8 @@ public class LightFramework
double radiusInMeters,
int maxCount);
@NonNull
private static native String nativeMakeFeatureId(@NonNull String mwmName, long mwmVersion,
int featureIndex);
public static native String nativeMakeFeatureId(@NonNull String mwmName, long mwmVersion,
int featureIndex);
@NonNull
public static List<GeoFenceFeature> getLocalAdsFeatures(double lat, double lon,
@ -49,9 +49,4 @@ public class LightFramework
@NonNull String countryId, int featureIndex);
@Nullable
public static native NotificationCandidate nativeGetNotification();
@NonNull
public static String makeFeatureId(@NonNull String mwmName, long mwmVersion, int featureIndex) {
return LightFramework.nativeMakeFeatureId(mwmName, mwmVersion, featureIndex);
}
}

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

@ -113,6 +113,6 @@ public class FeatureId implements Parcelable
@Override
public String toString()
{
return LightFramework.makeFeatureId(mMwmName, mMwmVersion, mFeatureIndex);
return LightFramework.nativeMakeFeatureId(mMwmName, mMwmVersion, mFeatureIndex);
}
}