Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2014-10-07 17:17:38 +03:00
commit e43128f76d
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/core/android/CoreResourcesFromAndroidAssetsCustom.java
View file

@ -14,7 +14,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.osmand.core.jni.BoolPtr;
import net.osmand.core.jni.ICoreResourcesProvider;
import net.osmand.core.jni.interface_ICoreResourcesProvider;
import net.osmand.core.jni.SWIGTYPE_p_QByteArray;
import net.osmand.core.jni.SWIGTYPE_p_bool;
import net.osmand.core.jni.SwigUtilities;
@ -27,7 +27,7 @@ import android.content.res.AssetManager;
import android.util.Log;
// This class provides reverse mapping from 'embed-resources.list' to files&folders scheme used by OsmAndCore_android.aar package
public class CoreResourcesFromAndroidAssetsCustom extends ICoreResourcesProvider {
public class CoreResourcesFromAndroidAssetsCustom extends interface_ICoreResourcesProvider {
private static final String TAG = "CoreResourcesFromAndroidAssets";
private static final String NATIVE_TAG = "CoreResourcesFromAndroidAssets";
@ -262,4 +262,4 @@ public class CoreResourcesFromAndroidAssetsCustom extends ICoreResourcesProvider
return bundle;
}
}
}

4
OsmAnd/src/net/osmand/core/android/GLActivity.java
View file

@ -167,7 +167,7 @@ public class GLActivity extends Activity {
Log.i(TAG, "Initializing core...");
_coreResources = CoreResourcesFromAndroidAssetsCustom.loadFromCurrentApplication(this);
OsmAndCore.InitializeCore(_coreResources);
OsmAndCore.InitializeCore(_coreResources.instantiateProxy());
File directory =getApp().getAppPath("");
_fileLogSink = QIODeviceLogSink.createFileLogSink(directory.getAbsolutePath() + "/osmandcore.log");
@ -503,4 +503,4 @@ public class GLActivity extends Activity {
public boolean onOptionsItemSelected(MenuItem item) {
return super.onOptionsItemSelected(item);
}
}
}

4
OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file

@ -406,7 +406,7 @@ public class WaypointHelper {
}
public void clearAllVisiblePoints() {
this.locationPointsStates.clear();
//this.locationPointsStates.clear();
this.locationPoints = new ArrayList<List<LocationPointWrapper>>();
}
@ -478,7 +478,7 @@ public class WaypointHelper {
protected synchronized void setLocationPoints(List<List<LocationPointWrapper>> locationPoints, RouteCalculationResult route) {
this.locationPoints = locationPoints;
this.locationPointsStates.clear();
//this.locationPointsStates.clear();
TIntArrayList list = new TIntArrayList(locationPoints.size());
list.fill(0, locationPoints.size(), 0);
this.pointsProgress = list;

2
OsmAnd/src/net/osmand/plus/views/corenative/NativeQtLibrary.java
View file

@ -125,7 +125,7 @@ public class NativeQtLibrary {
" referenceTileSize = " + referenceTileSize + " rasterTileSize = " + rasterTileSize);
Log.i(NATIVE_TAG, "Initializing core...");
CoreResourcesFromAndroidAssetsCustom coreResources = notGc(CoreResourcesFromAndroidAssetsCustom.loadFromCurrentApplication(app));
OsmAndCore.InitializeCore(coreResources);
OsmAndCore.InitializeCore(coreResources.instantiateProxy());
// initialize log
File directory = app.getAppPath("");