mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added global singleton

Browse source 
to keep Quadtree data across activity lifecycle
This commit is contained in:
misaochan 2016-01-06 16:55:38 +13:00
parent 920da3b592
commit 3d19d6be31
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
commons/src/main/java/fr/free/nrw/commons/CacheApplication.java Normal file
View file

@ -0,0 +1,11 @@
package fr.free.nrw.commons;
import android.app.Application;
import fr.free.nrw.commons.caching.CacheController;
public class CacheApplication extends Application
{
public CacheController data = new CacheController();
}

5
commons/src/main/java/fr/free/nrw/commons/caching/CacheController.java
View file

@ -18,12 +18,11 @@ public class CacheController {
private Point[] pointsFound;
public CacheController() {
quadTree = new QuadTree(-180, -90, +180, +90);
}
public void initQuadTree(double decLongitude, double decLatitude) {
quadTree = new QuadTree(-180, -90, +180, +90);
public void setQtPoint(double decLongitude, double decLatitude) {
x = decLongitude;
y = decLatitude;
Log.d("Cache", "New QuadTree created");

9
commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file

@ -183,7 +183,10 @@ public class ShareActivity
FilePathConverter uriObj = new FilePathConverter(this, mediaUri);
String filePath = uriObj.getFilePath();
cacheObj = new CacheController();
//Using global singleton to get CacheController to last longer than the activity lifecycle
CacheApplication cacheObj = ((CacheApplication)this.getApplication());
if (filePath != null) {
//extract the coordinates of image in decimal degrees
@ -197,9 +200,9 @@ public class ShareActivity
if (decimalCoords != null) {
Log.d("Coords", "Decimal coords of image: " + decimalCoords);
cacheObj.initQuadTree(decLongitude, decLatitude);
cacheObj.data.setQtPoint(decLongitude, decLatitude);
cacheObj.findCategory();
cacheObj.data.findCategory();
//TODO: If no categories found from cache in that area, call MW API
//asynchronous calls to MediaWiki Commons API to match image coords with nearby Commons categories