wallabag/android-app
1
0
Fork 0
mirror of https://github.com/wallabag/android-app.git synced 2026-05-19 15:10:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #67 from wallabag/dev

Browse Source 
Bringing changes to legacy branch
This commit is contained in:
Thomas Citharel
2015-01-12 23:26:07 +01:00
parent 47ba9209d5 eea88f02b6
commit a4f34ecc52
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/fr/gaulupeau/apps/Poche/Poche.java
+10 -3
View File
@@ -207,7 +207,7 @@ public class Poche extends Activity implements FeedUpdaterInterface {
if (pref.getInt("update_checker", 0) < 9) {
// Wipe Database, because we now save HTML content instead of plain text
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(this);
database = helper.getReadableDatabase();
getDatabase();
helper.truncateTables(database);
showToast("Update: Wiped Database. Please synchronize.");
}
@@ -229,6 +229,13 @@ public class Poche extends Activity implements FeedUpdaterInterface {
apiToken = settings.getString("APIToken", "");
}
private void getDatabase() {
if (database == null) {
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(this);
database = helper.getReadableDatabase();
}
}
@Override
protected void onResume() {
super.onResume();
@@ -258,7 +265,7 @@ public class Poche extends Activity implements FeedUpdaterInterface {
runOnUiThread(new Runnable() {
public void run() {
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(getApplicationContext());
database = helper.getReadableDatabase();
getDatabase();
int news = database.query(ARTICLE_TABLE, null, ARCHIVE + "=0", null, null, null, null).getCount();
btnGetPost.setText(String.format(getString(R.string.btnGetPost), news));
}
@@ -301,4 +308,4 @@ public class Poche extends Activity implements FeedUpdaterInterface {
updateUnread();
findViewById(R.id.progressBar1).setVisibility(View.GONE);
}
}
}