moparisthebest/android-app
1
0
Fork 0
mirror of https://github.com/moparisthebest/android-app synced 2024-11-15 05:15:04 -05:00
Code Issues Releases Wiki Activity

Récupération des articles par flux RSS

Browse Source
This commit is contained in:
GAULUPEAU Jonathan 2014-01-04 17:18:39 +01:00
parent 303cd9b6d0
commit 6f077b2346
9 changed files with 337 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="fr.gaulupeau.apps.InThePoche"
android:versionCode="3"
android:versionName="1.0.2" xmlns:android="http://schemas.android.com/apk/res/android">
android:versionCode="4"
android:versionName="1.5" xmlns:android="http://schemas.android.com/apk/res/android">
<uses-sdk android:minSdkVersion="8"
android:targetSdkVersion="8" />
<uses-permission android:name="android.permission.INTERNET"/>

16
res/layout/settings.xml
View File

@ -41,22 +41,6 @@
<requestFocus />
</EditText>
<TextView
android:id="@+id/txtGlobalToken"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/txtGlobalToken"
android:textSize="18sp" />
<EditText
android:id="@+id/globalToken"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="10"
android:inputType="text" />
<TextView
android:id="@+id/txtAPIUsername"
android:layout_width="wrap_content"

5
res/values/strings.xml
View File

@ -18,7 +18,8 @@
<string name="txtSyncDone">Synchronize done !</string>
<string name="txtSyncFailed">Synchronize failed !</string>
<string name="txtNetOffline">Check Internet Connectivity !</string>
<string name="txtConfigNotSet">Please configure the app before Syncing !</string>
<string name="txtGlobalToken"><b><u>API global token :</u></b></string>
<string name="txtAPIUsername"><b><u>Your API username :</u></b></string>
<string name="txtAPIToken"><b><u>Your API token :</u></b></string>
<string name="txtAPIUsername"><b><u>Your username ID (user_id in Feed URL):</u></b></string>
<string name="txtAPIToken"><b><u>Your token (token in Feed URL):</u></b></string>
</resources>

2
src/fr/gaulupeau/apps/Poche/ArticlesSQLiteOpenHelper.java
View File

@ -64,7 +64,7 @@ public class ArticlesSQLiteOpenHelper extends SQLiteOpenHelper {
ARCHIVE + " integer," +
ARTICLE_SYNC + " integer," +
ARTICLE_READAT + " integer," +
"UNIQUE (" + ARTICLE_ID + ")" +
"UNIQUE (" + ARTICLE_URL + ")" +
");"
);
}

2
src/fr/gaulupeau/apps/Poche/ListArticles.java
View File

@ -84,7 +84,7 @@ public class ListArticles extends Activity {
public ReadingListAdapter getAdapterQuery(String filter, ArrayList<Article> articleInfo) {
//Log.e("getAdapterQuery", "running query");
//String url, String domain, String id, String title, String content
String[] getStrColumns = new String[] {ARTICLE_URL, ARTICLE_ID, ARTICLE_TITLE, ARTICLE_CONTENT, ARCHIVE};
String[] getStrColumns = new String[] {ARTICLE_URL, MY_ID, ARTICLE_TITLE, ARTICLE_CONTENT, ARCHIVE};
Cursor ac = database.query(
ARTICLE_TABLE,
getStrColumns,

470
src/fr/gaulupeau/apps/Poche/Poche.java
View File

@ -9,14 +9,28 @@
package fr.gaulupeau.apps.Poche;
import fr.gaulupeau.apps.InThePoche.R;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.Authenticator;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.PasswordAuthentication;
import java.net.URL;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import com.thetransactioncompany.jsonrpc2.JSONRPC2ParseException;
import com.thetransactioncompany.jsonrpc2.JSONRPC2Request;
@ -35,9 +49,12 @@ import android.database.sqlite.SQLiteConstraintException;
import android.database.sqlite.SQLiteDatabase;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.Browser;
import android.text.Html;
import android.util.Base64;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@ -59,16 +76,15 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_SYNC;
* Main activity class
*/
@TargetApi(Build.VERSION_CODES.FROYO) public class Poche extends Activity {
private SQLiteDatabase database;
private static SQLiteDatabase database;
Button btnDone;
Button btnGetPost;
Button btnSync;
EditText editPocheUrl;
SharedPreferences settings;
String globalToken;
String apiUsername;
String apiToken;
String pocheUrl;
static String apiUsername;
static String apiToken;
static String pocheUrl;
String action;
/** Called when the activity is first created.
@ -93,12 +109,32 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_SYNC;
final ConnectivityManager conMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo();
if (activeNetwork != null && activeNetwork.isConnected()) {
// Exécution de la synchro en arrière-plan
new Thread(new Runnable() {
public void run() {
pocheIt(pageUrl);
}
}).start();
// Start to build the poche URL
Uri.Builder pocheSaveUrl = Uri.parse(pocheUrl).buildUpon();
// Add the parameters from the call
pocheSaveUrl.appendQueryParameter("action", "add");
byte[] data = null;
try {
data = pageUrl.getBytes("UTF-8");
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
String base64 = Base64.encodeToString(data, Base64.DEFAULT);
pocheSaveUrl.appendQueryParameter("url", base64);
System.out.println("base64 : " + base64);
System.out.println("pageurl : " + pageUrl);
// Load the constructed URL in the browser
Intent i = new Intent(Intent.ACTION_VIEW);
i.setData(pocheSaveUrl.build());
i.putExtra(Browser.EXTRA_APPLICATION_ID, getPackageName());
// If user has more then one browser installed give them a chance to
// select which one they want to use
startActivity(i);
// That is all this app needs to do, so call finish()
this.finish();
} else {
// Afficher alerte connectivité
showToast(getString(R.string.txtNetOffline));
@ -114,12 +150,14 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_SYNC;
// Vérification de la connectivité Internet
final ConnectivityManager conMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo();
if (activeNetwork != null && activeNetwork.isConnected()) {
if (pocheUrl != "http://") {
showToast(getString(R.string.txtConfigNotSet));
} else if (activeNetwork != null && activeNetwork.isConnected()) {
// Exécution de la synchro en arrière-plan
new Thread(new Runnable() {
public void run() {
pushRead();
fetchUnread();
//pushRead();
parseRSS();
}
}).start();
} else {
@ -131,7 +169,7 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_SYNC;
});
btnGetPost = (Button)findViewById(R.id.btnGetPost);
updateUnread();
//updateUnread();
btnGetPost.setOnClickListener(new OnClickListener() {
@Override
@ -146,7 +184,6 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_SYNC;
private void getSettings(){
settings = getSharedPreferences(PREFS_NAME, 0);
pocheUrl = settings.getString("pocheUrl", "http://");
globalToken = settings.getString("globalToken", "");
apiUsername = settings.getString("APIUsername", "");
apiToken = settings.getString("APIToken", "");
}
@ -208,155 +245,284 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_SYNC;
}
public void pocheIt(String url){
String id ="req-001";
JSONRPC2Request reqOut = null;
try{
reqOut = JSONRPC2Request.parse("{\"jsonrpc\":\"2.0\",\"method\":\"item.add\",\"id\":\"" + id + "\",\"params\":[{\"username\":\""+ apiUsername + "\",\"api_token\":\""+ apiToken +"\"}, \"" + url + "\", true]}");
System.err.println(reqOut.toString());
JSONRPC2Response response = sendRequest(reqOut);
if (response.indicatesSuccess()) {
showToast(getString(R.string.txtSyncDone));
}
} catch (JSONRPC2ParseException e2) {
e2.printStackTrace();
showToast(getString(R.string.txtSyncFailed));
}
finish();
}
// public void pocheIt(String url){
// String id ="req-001";
// JSONRPC2Request reqOut = null;
// try{
// reqOut = JSONRPC2Request.parse("{\"jsonrpc\":\"2.0\",\"method\":\"item.add\",\"id\":\"" + id + "\",\"params\":[{\"username\":\""+ apiUsername + "\",\"api_token\":\""+ apiToken +"\"}, \"" + url + "\", true]}");
// System.err.println(reqOut.toString());
// JSONRPC2Response response = sendRequest(reqOut);
// if (response.indicatesSuccess()) {
// showToast(getString(R.string.txtSyncDone));
// }
// } catch (JSONRPC2ParseException e2) {
// e2.printStackTrace();
// showToast(getString(R.string.txtSyncFailed));
// }
// finish();
// }
public void pushRead(){
JSONRPC2Request reqOut = null;
String filter = ARCHIVE + "=1 AND " + ARTICLE_SYNC + "=0";
String[] getStrColumns = new String[] {ARTICLE_ID};
Cursor ac = database.query(
ARTICLE_TABLE,
getStrColumns,
filter, null, null, null, null);
ac.moveToFirst();
if(!ac.isAfterLast()) {
do {
String article_id = ac.getString(0);
String id ="req-001";
try{
reqOut = JSONRPC2Request.parse("{\"jsonrpc\":\"2.0\",\"method\":\"item.mark_as_read\",\"id\":\"" + id + "\",\"params\":[{\"username\":\""+ apiUsername + "\",\"api_token\":\""+ apiToken +"\"}, " + article_id + "]}");
System.err.println(reqOut.toString());
JSONRPC2Response response = sendRequest(reqOut);
if (response.indicatesSuccess()) {
ContentValues values = new ContentValues();
values.put(ARTICLE_SYNC, 1);
database.update(ARTICLE_TABLE, values, ARTICLE_ID + "=" + article_id, null);
}
} catch (JSONRPC2ParseException e2) {
e2.printStackTrace();
}
} while (ac.moveToNext());
}
ac.close();
}
// public void pushRead(){
// JSONRPC2Request reqOut = null;
// String filter = ARCHIVE + "=1 AND " + ARTICLE_SYNC + "=0";
// String[] getStrColumns = new String[] {ARTICLE_ID};
// Cursor ac = database.query(
// ARTICLE_TABLE,
// getStrColumns,
// filter, null, null, null, null);
// ac.moveToFirst();
// if(!ac.isAfterLast()) {
// do {
// String article_id = ac.getString(0);
// String id ="req-001";
// try{
// reqOut = JSONRPC2Request.parse("{\"jsonrpc\":\"2.0\",\"method\":\"item.mark_as_read\",\"id\":\"" + id + "\",\"params\":[{\"username\":\""+ apiUsername + "\",\"api_token\":\""+ apiToken +"\"}, " + article_id + "]}");
// System.err.println(reqOut.toString());
// JSONRPC2Response response = sendRequest(reqOut);
// if (response.indicatesSuccess()) {
// ContentValues values = new ContentValues();
// values.put(ARTICLE_SYNC, 1);
// database.update(ARTICLE_TABLE, values, ARTICLE_ID + "=" + article_id, null);
// }
// } catch (JSONRPC2ParseException e2) {
// e2.printStackTrace();
// }
// } while (ac.moveToNext());
// }
// ac.close();
//
// }
public void updateReads(){
String lastUpdate = settings.getString("lastUpdate", "");
SharedPreferences.Editor editor = settings.edit();
editor.putString("lastUpdate", "");
//TODO Continuer la fonction en se basant sur le timestamp "update" de Poche
}
public void fetchUnread(){
String id = "req-001";
JSONRPC2Request reqOut = null;
try {
// POCHE A LINK
//reqOut = JSONRPC2Request.parse("{\"jsonrpc\":\"2.0\",\"method\":\"item.add\",\"id\":\"req-001\",\"params\":[{\"username\":\"poche\",\"api_token\":\"cPG2urVgA+ToMXY\"},\"http://cdetc.fr\",true]}");
// GET A LINK
//reqOut = JSONRPC2Request.parse("{\"jsonrpc\":\"2.0\",\"method\":\"item.info\",\"id\":\"" + id + "\",\"params\":[{\"username\":\""+ apiUsername + "\",\"api_token\":\""+ apiToken +"\"}, 1]}");
// GET ALL UNREAD
reqOut = JSONRPC2Request.parse("{\"jsonrpc\":\"2.0\",\"method\":\"item.list_unread\",\"id\":\"" + id + "\",\"params\":[{\"username\":\""+ apiUsername + "\",\"api_token\":\""+ apiToken +"\"}, null, null]}");
System.err.println(reqOut.toString());
} catch (JSONRPC2ParseException e2) {
e2.printStackTrace();
}
System.out.println(reqOut.toString());
URL url = null;
try {
final String rpcuser ="api_user";
final String rpcpassword = globalToken;
public void parseRSS(){
Authenticator.setDefault(new Authenticator() {
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication (rpcuser, rpcpassword.toCharArray());
}});
url = new URL(pocheUrl + "/jsonrpc.php");
} catch (MalformedURLException e1) {
e1.printStackTrace();
}
JSONRPC2Session session = new JSONRPC2Session(url);
JSONRPC2Response response = null;
try{
response = session.send(reqOut);
} catch (JSONRPC2SessionException e) {
URL url;
try
{
// Set the url (you will need to change this to your RSS URL
url = new URL(pocheUrl + "/?feed&type=home&user_id=" + apiUsername + "&token=" + apiToken );
System.err.println(e.getMessage());
}
if (response.indicatesSuccess()){
JSONObject article = null;
ContentValues values = new ContentValues();
try {
JSONArray ret = new JSONArray(response.getResult().toString());
for (int i = 0; i < ret.length(); i++) {
article = ret.getJSONObject(i);
values.put(ARTICLE_TITLE, Html.fromHtml(article.getString("title")).toString());
values.put(ARTICLE_CONTENT, Html.fromHtml(article.getString("content")).toString());
values.put(ARTICLE_ID, Html.fromHtml(article.getString("id")).toString());
values.put(ARTICLE_URL, Html.fromHtml(article.getString("url")).toString());
values.put(ARCHIVE, 0);
values.put(ARTICLE_SYNC, 0);
try {
database.insertOrThrow(ARTICLE_TABLE, null, values);
} catch (SQLiteConstraintException e) {
continue;
// Setup the connection
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
// Connect
if (conn.getResponseCode() == HttpURLConnection.HTTP_OK)
{
// Retreive the XML from the URL
DocumentBuilderFactory dbf = DocumentBuilderFactory
.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
Document doc;
doc = db.parse(url.openStream());
doc.getDocumentElement().normalize();
// This is the root node of each section you want to parse
NodeList itemLst = doc.getElementsByTagName("item");
// This sets up some arrays to hold the data parsed
arrays.PodcastTitle = new String[itemLst.getLength()];
arrays.PodcastURL = new String[itemLst.getLength()];
arrays.PodcastContent = new String[itemLst.getLength()];
arrays.PodcastMedia = new String[itemLst.getLength()];
// Loop through the XML passing the data to the arrays
for (int i = 0; i < itemLst.getLength(); i++)
{
Node item = itemLst.item(i);
if (item.getNodeType() == Node.ELEMENT_NODE)
{
Element ielem = (Element) item;
// This section gets the elements from the XML
// that we want to use you will need to add
// and remove elements that you want / don't want
NodeList title = ielem.getElementsByTagName("title");
NodeList link = ielem.getElementsByTagName("link");
NodeList content = ielem
.getElementsByTagName("description");
//NodeList media = ielem
// .getElementsByTagName("media:content");
// This is an attribute of an element so I create
// a string to make it easier to use
//String mediaurl = media.item(0).getAttributes()
// .getNamedItem("url").getNodeValue();
// This section adds an entry to the arrays with the
// data retrieved from above. I have surrounded each
// with try/catch just incase the element does not
// exist
try
{
arrays.PodcastTitle[i] = title.item(0)
.getChildNodes().item(0).getNodeValue();
} catch (NullPointerException e)
{
e.printStackTrace();
}
try
{
arrays.PodcastURL[i] = link.item(0).getChildNodes()
.item(0).getNodeValue();
} catch (NullPointerException e)
{
e.printStackTrace();
}
try
{
arrays.PodcastContent[i] = content.item(0)
.getChildNodes().item(0).getNodeValue();
} catch (NullPointerException e)
{
e.printStackTrace();
}
try
{
// arrays.PodcastMedia[i] = mediaurl;
} catch (NullPointerException e)
{
e.printStackTrace();
}
ContentValues values = new ContentValues();
values.put(ARTICLE_TITLE, Html.fromHtml(arrays.PodcastTitle[i]).toString());
values.put(ARTICLE_CONTENT, Html.fromHtml(arrays.PodcastContent[i]).toString());
//values.put(ARTICLE_ID, Html.fromHtml(article.getString("id")).toString());
values.put(ARTICLE_URL, Html.fromHtml(arrays.PodcastURL[i]).toString());
values.put(ARCHIVE, 0);
values.put(ARTICLE_SYNC, 0);
try {
database.insertOrThrow(ARTICLE_TABLE, null, values);
} catch (SQLiteConstraintException e) {
continue;
}
}
}
} catch (JSONException e) {
e.printStackTrace();
showToast(getString(R.string.txtSyncFailed));
}
showToast(getString(R.string.txtSyncDone));
showToast(getString(R.string.txtSyncDone));
updateUnread();
}else{
System.out.println(response.getError().getMessage( ));
showToast(getString(R.string.txtSyncFailed));
}
} catch (MalformedURLException e)
{
e.printStackTrace();
} catch (DOMException e)
{
e.printStackTrace();
} catch (IOException e)
{
e.printStackTrace();
} catch (ParserConfigurationException e)
{
e.printStackTrace();
} catch (SAXException e)
{
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
}
}
public JSONRPC2Response sendRequest(JSONRPC2Request reqOut){
URL url = null;
try {
final String rpcuser ="api_user";
final String rpcpassword = globalToken;
Authenticator.setDefault(new Authenticator() {
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication (rpcuser, rpcpassword.toCharArray());
}});
url = new URL(pocheUrl + "/jsonrpc.php");
} catch (MalformedURLException e1) {
e1.printStackTrace();
}
JSONRPC2Session session = new JSONRPC2Session(url);
JSONRPC2Response response = null;
try{
response = session.send(reqOut);
} catch (JSONRPC2SessionException e) {
System.err.println(e.getMessage());
}
return response;
}
// public void fetchUnread(){
// String id = "req-001";
// JSONRPC2Request reqOut = null;
// try {
// // POCHE A LINK
// //reqOut = JSONRPC2Request.parse("{\"jsonrpc\":\"2.0\",\"method\":\"item.add\",\"id\":\"req-001\",\"params\":[{\"username\":\"poche\",\"api_token\":\"cPG2urVgA+ToMXY\"},\"http://cdetc.fr\",true]}");
// // GET A LINK
// //reqOut = JSONRPC2Request.parse("{\"jsonrpc\":\"2.0\",\"method\":\"item.info\",\"id\":\"" + id + "\",\"params\":[{\"username\":\""+ apiUsername + "\",\"api_token\":\""+ apiToken +"\"}, 1]}");
// // GET ALL UNREAD
// reqOut = JSONRPC2Request.parse("{\"jsonrpc\":\"2.0\",\"method\":\"item.list_unread\",\"id\":\"" + id + "\",\"params\":[{\"username\":\""+ apiUsername + "\",\"api_token\":\""+ apiToken +"\"}, null, null]}");
// System.err.println(reqOut.toString());
// } catch (JSONRPC2ParseException e2) {
// e2.printStackTrace();
// }
// System.out.println(reqOut.toString());
// URL url = null;
// try {
// final String rpcuser ="api_user";
// final String rpcpassword = globalToken;
//
// Authenticator.setDefault(new Authenticator() {
// protected PasswordAuthentication getPasswordAuthentication() {
// return new PasswordAuthentication (rpcuser, rpcpassword.toCharArray());
// }});
// url = new URL(pocheUrl + "/jsonrpc.php");
// } catch (MalformedURLException e1) {
// e1.printStackTrace();
// }
// JSONRPC2Session session = new JSONRPC2Session(url);
// JSONRPC2Response response = null;
// try{
// response = session.send(reqOut);
// } catch (JSONRPC2SessionException e) {
//
// System.err.println(e.getMessage());
// }
// if (response.indicatesSuccess()){
// JSONObject article = null;
// ContentValues values = new ContentValues();
// try {
// JSONArray ret = new JSONArray(response.getResult().toString());
// for (int i = 0; i < ret.length(); i++) {
// article = ret.getJSONObject(i);
// values.put(ARTICLE_TITLE, Html.fromHtml(article.getString("title")).toString());
// values.put(ARTICLE_CONTENT, Html.fromHtml(article.getString("content")).toString());
// values.put(ARTICLE_ID, Html.fromHtml(article.getString("id")).toString());
// values.put(ARTICLE_URL, Html.fromHtml(article.getString("url")).toString());
// values.put(ARCHIVE, 0);
// values.put(ARTICLE_SYNC, 0);
// try {
// database.insertOrThrow(ARTICLE_TABLE, null, values);
// } catch (SQLiteConstraintException e) {
// continue;
// }
// }
// } catch (JSONException e) {
// e.printStackTrace();
// showToast(getString(R.string.txtSyncFailed));
// }
//
// showToast(getString(R.string.txtSyncDone));
// updateUnread();
// }else{
// System.out.println(response.getError().getMessage( ));
// showToast(getString(R.string.txtSyncFailed));
// }
// }
//
// public JSONRPC2Response sendRequest(JSONRPC2Request reqOut){
// URL url = null;
// try {
// final String rpcuser ="api_user";
// final String rpcpassword = globalToken;
//
// Authenticator.setDefault(new Authenticator() {
// protected PasswordAuthentication getPasswordAuthentication() {
// return new PasswordAuthentication (rpcuser, rpcpassword.toCharArray());
// }});
// url = new URL(pocheUrl + "/jsonrpc.php");
// } catch (MalformedURLException e1) {
// e1.printStackTrace();
// }
// JSONRPC2Session session = new JSONRPC2Session(url);
// JSONRPC2Response response = null;
// try{
// response = session.send(reqOut);
// } catch (JSONRPC2SessionException e) {
//
// System.err.println(e.getMessage());
// }
// return response;
// }
}

7
src/fr/gaulupeau/apps/Poche/ReadArticle.java
View File

@ -7,6 +7,7 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_TITLE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_URL;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_TABLE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_AUTHOR;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.MY_ID;
import android.app.Activity;
import android.content.ContentValues;
@ -38,12 +39,12 @@ public class ReadArticle extends Activity {
view = (ScrollView) findViewById(R.id.scroll);
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(getApplicationContext());
database = helper.getWritableDatabase();
String[] getStrColumns = new String[] {ARTICLE_URL, ARTICLE_ID, ARTICLE_TITLE, ARTICLE_CONTENT, ARCHIVE, ARTICLE_AUTHOR};
String[] getStrColumns = new String[] {ARTICLE_URL, MY_ID, ARTICLE_TITLE, ARTICLE_CONTENT, ARCHIVE, ARTICLE_AUTHOR};
Bundle data = getIntent().getExtras();
if(data != null) {
id = data.getString("id");
}
Cursor ac = database.query(ARTICLE_TABLE, getStrColumns, ARTICLE_ID + "=" + id, null, null, null, null);
Cursor ac = database.query(ARTICLE_TABLE, getStrColumns, MY_ID + "=" + id, null, null, null, null);
ac.moveToFirst();
txtTitre = (TextView)findViewById(R.id.txtTitre);
txtTitre.setText(ac.getString(2));
@ -58,7 +59,7 @@ public class ReadArticle extends Activity {
public void onClick(View v) {
ContentValues values = new ContentValues();
values.put(ARCHIVE, 1);
database.update(ARTICLE_TABLE, values, ARTICLE_ID + "=" + id, null);
database.update(ARTICLE_TABLE, values, MY_ID + "=" + id, null);
}
});

4
src/fr/gaulupeau/apps/Poche/Settings.java
View File

@ -25,15 +25,12 @@ public class Settings extends Activity {
String pocheUrl = settings.getString("pocheUrl", "http://");
String apiUsername = settings.getString("APIUsername", "");
String apiToken = settings.getString("APIToken", "");
String globalToken = settings.getString("globalToken", "");
editPocheUrl = (EditText)findViewById(R.id.pocheUrl);
editPocheUrl.setText(pocheUrl);
editAPIUsername = (EditText)findViewById(R.id.APIUsername);
editAPIUsername.setText(apiUsername);
editAPIToken = (EditText)findViewById(R.id.APIToken);
editAPIToken.setText(apiToken);
editGlobalToken = (EditText)findViewById(R.id.globalToken);
editGlobalToken.setText(globalToken);
btnDone = (Button)findViewById(R.id.btnDone);
btnDone.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
@ -42,7 +39,6 @@ public class Settings extends Activity {
editor.putString("pocheUrl", editPocheUrl.getText().toString());
editor.putString("APIUsername", editAPIUsername.getText().toString());
editor.putString("APIToken", editAPIToken.getText().toString());
editor.putString("globalToken", editGlobalToken.getText().toString());
editor.commit();
finish();
}

8
src/fr/gaulupeau/apps/Poche/arrays.java Normal file
View File

@ -0,0 +1,8 @@
package fr.gaulupeau.apps.Poche;
public class arrays {
public static String[] PodcastTitle;
public static String[] PodcastURL;
public static String[] PodcastContent;
public static String[] PodcastMedia;
}