yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 10:19:33 +02:00
Code Issues Releases Wiki Activity

code uniformization

Browse source
This commit is contained in:
Nikolay Pultsin 2011-06-26 15:13:14 +01:00
parent dd3844c43c
commit f7d1ad84c4
3 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
View file

@ -78,7 +78,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
}
@Override
protected List<INetworkLink> loadLinks() {
protected List<INetworkLink> listLinks() {
final List<INetworkLink> links = new LinkedList<INetworkLink>();
final Cursor cursor = myDatabase.rawQuery("SELECT link_id,title,site_name,summary FROM Links", null);
@ -121,11 +121,11 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
private SQLiteStatement myUpdateCustomLinkUrlStatement;
private SQLiteStatement myDeleteCustomLinkUrlStatement;
@Override
protected void saveCustomLink(final ICustomNetworkLink link) {
protected void saveLink(final INetworkLink link) {
executeAsATransaction(new Runnable() {
public void run() {
final SQLiteStatement statement;
if (link.getId() == ICustomNetworkLink.INVALID_ID) {
if (link.getId() == INetworkLink.INVALID_ID) {
if (myInsertCustomLinkStatement == null) {
myInsertCustomLinkStatement = myDatabase.compileStatement(
"INSERT INTO Links (title,site_name,summary,is_predefined,is_enabled) VALUES (?,?,?,?,?)"
@ -215,32 +215,23 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
});
}
private SQLiteStatement myDeleteAllCustomLinksStatement;
private SQLiteStatement myDeleteCustomLinkStatement;
@Override
protected void deleteCustomLink(final ICustomNetworkLink link) {
if (link.getId() == ICustomNetworkLink.INVALID_ID) {
protected void deleteLink(final INetworkLink link) {
if (link.getId() == INetworkLink.INVALID_ID) {
return;
}
executeAsATransaction(new Runnable() {
public void run() {
final long id = link.getId();
if (myDeleteAllCustomLinksStatement == null) {
myDeleteAllCustomLinksStatement = myDatabase.compileStatement(
"DELETE FROM LinkUrls WHERE link_id = ?");
}
myDeleteAllCustomLinksStatement.bindLong(1, id);
myDeleteAllCustomLinksStatement.execute();
if (myDeleteCustomLinkStatement == null) {
myDeleteCustomLinkStatement = myDatabase.compileStatement(
"DELETE FROM Links WHERE link_id = ?"
final String stringLinkId = String.valueOf(link.getId());
myDatabase.rawQuery(
"DELETE FROM LinkUrls WHERE link_id = ?",
new String[] { stringLinkId }
);
}
myDeleteCustomLinkStatement.bindLong(1, id);
myDeleteCustomLinkStatement.execute();
link.setId(ICustomNetworkLink.INVALID_ID);
myDatabase.rawQuery(
"DELETE FROM Links WHERE link_id = ?",
new String[] { stringLinkId }
);
link.setId(INetworkLink.INVALID_ID);
}
});
}
@ -260,7 +251,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
@Override
protected void setLinkExtras(INetworkLink link, Map<String,String> extras) {
if (link.getId() == -1) {
if (link.getId() == INetworkLink.INVALID_ID) {
return;
}
final String stringLinkId = String.valueOf(link.getId());

7
src/org/geometerplus/fbreader/network/NetworkDatabase.java
View file

@ -45,9 +45,10 @@ public abstract class NetworkDatabase {
return new OPDSCustomLink(id, siteName, title, summary, infos);
}
protected abstract List<INetworkLink> loadLinks();
protected abstract void saveCustomLink(ICustomNetworkLink link);
protected abstract void deleteCustomLink(ICustomNetworkLink link);
protected abstract List<INetworkLink> listLinks();
protected abstract void saveLink(INetworkLink link);
protected abstract void deleteLink(INetworkLink link);
protected abstract Map<String,String> getLinkExtras(INetworkLink link);
protected abstract void setLinkExtras(INetworkLink link, Map<String,String> extras);
}

8
src/org/geometerplus/fbreader/network/NetworkLibrary.java
View file

@ -179,7 +179,7 @@ public class NetworkLibrary {
final NetworkDatabase db = NetworkDatabase.Instance();
if (db != null) {
myLinks.addAll(db.loadLinks());
myLinks.addAll(db.listLinks());
}
myIsAlreadyInitialized = true;
@ -238,7 +238,7 @@ public class NetworkLibrary {
final ICustomNetworkLink customLink = (ICustomNetworkLink)link;
if (customLink.isObsolete(12 * 60 * 60 * 1000)) { // 12 hours
customLink.reloadInfo(true);
NetworkDatabase.Instance().saveCustomLink(customLink);
NetworkDatabase.Instance().saveLink(customLink);
}
}
}
@ -483,13 +483,13 @@ public class NetworkLibrary {
}
}
}
NetworkDatabase.Instance().saveCustomLink(link);
NetworkDatabase.Instance().saveLink(link);
invalidateChildren();
}
public void removeCustomLink(ICustomNetworkLink link) {
myLinks.remove(link);
NetworkDatabase.Instance().deleteCustomLink(link);
NetworkDatabase.Instance().deleteLink(link);
invalidateChildren();
}
}