moparisthebest
/
android-app
mirror of https://github.com/moparisthebest/android-app
1
0
Fork 0
Code Issues Releases Wiki Activity

cleaning up source code

This commit is contained in:
Kevin Meyer 2014-11-13 19:55:20 +01:00
parent 440354e578
commit cb2c1dc04b
10 changed files with 541 additions and 597 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/fr/gaulupeau/apps/Poche/Article.java
View File

@ -1,19 +1,17 @@
package fr.gaulupeau.apps.Poche; package fr.gaulupeau.apps.Poche;
import android.util.Log;
import java.net.URL; import java.net.URL;
public class Article { public class Article {
public String url; public String url;
public String id; public String id;
public String title; public String title;
public String content; public String content;
public String archive; public String archive;
private URL m_url = null; private URL m_url = null;
public Article(String url, String id, String title, String content, String archive) { public Article(String url, String id, String title, String content, String archive) {
super(); super();
this.url = url; this.url = url;
this.id = id; this.id = id;
@ -26,7 +24,7 @@ public class Article {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
public String getHostOfUrl() { public String getHostOfUrl() {
if (this.m_url != null) { if (this.m_url != null) {

111
app/src/main/java/fr/gaulupeau/apps/Poche/ArticlesSQLiteOpenHelper.java
View File

@ -4,6 +4,7 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import static fr.gaulupeau.apps.Poche.Helpers.PREFS_NAME; import static fr.gaulupeau.apps.Poche.Helpers.PREFS_NAME;
import static fr.gaulupeau.apps.Poche.Helpers.zeroUpdate; import static fr.gaulupeau.apps.Poche.Helpers.zeroUpdate;
@ -11,68 +12,68 @@ import static fr.gaulupeau.apps.Poche.Helpers.zeroUpdate;
public class ArticlesSQLiteOpenHelper extends SQLiteOpenHelper { public class ArticlesSQLiteOpenHelper extends SQLiteOpenHelper {
public static final int VERSION = 1; public static final int VERSION = 1;
public static final String DB_NAME = "article_db.sqlite"; public static final String DB_NAME = "article_db.sqlite";
public static String MY_ID = "my_id"; public static String MY_ID = "my_id";
public static String ARTICLE_TABLE = "article"; public static String ARTICLE_TABLE = "article";
public static String ARTICLE_DATE = "update_date"; public static String ARTICLE_DATE = "update_date";
public static String ARTICLE_ID = "article_id"; public static String ARTICLE_ID = "article_id";
public static String ARTICLE_AUTHOR = "author"; public static String ARTICLE_AUTHOR = "author";
public static String ARTICLE_CONTENT = "content"; public static String ARTICLE_CONTENT = "content";
public static String ARTICLE_TITLE = "title"; public static String ARTICLE_TITLE = "title";
public static String ARTICLE_URL = "url"; public static String ARTICLE_URL = "url";
public static String ARCHIVE = "archive"; public static String ARCHIVE = "archive";
public static String ARTICLE_SYNC = "sync"; public static String ARTICLE_SYNC = "sync";
public static String ARTICLE_READAT = "read_at"; public static String ARTICLE_READAT = "read_at";
Context c; Context c;
public ArticlesSQLiteOpenHelper(Context context) { public ArticlesSQLiteOpenHelper(Context context) {
super(context, DB_NAME, null, VERSION); super(context, DB_NAME, null, VERSION);
c = context; c = context;
} }
@Override @Override
public void onCreate(SQLiteDatabase db) { public void onCreate(SQLiteDatabase db) {
createTables(db); createTables(db);
} }
@Override @Override
public void onOpen(SQLiteDatabase db) { public void onOpen(SQLiteDatabase db) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
super.onOpen(db); super.onOpen(db);
} }
@Override @Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
db.delete(ARTICLE_TABLE, null, null); db.delete(ARTICLE_TABLE, null, null);
SharedPreferences preferences = c.getSharedPreferences(PREFS_NAME, 0); SharedPreferences preferences = c.getSharedPreferences(PREFS_NAME, 0);
SharedPreferences.Editor editor = preferences.edit(); SharedPreferences.Editor editor = preferences.edit();
editor.putString("previous_update", zeroUpdate); editor.putString("previous_update", zeroUpdate);
editor.commit(); editor.commit();
} }
protected void createTables(SQLiteDatabase db) { protected void createTables(SQLiteDatabase db) {
db.execSQL( db.execSQL(
"create table " + ARTICLE_TABLE + " (" + "create table " + ARTICLE_TABLE + " (" +
MY_ID + " integer primary key autoincrement not null, " + MY_ID + " integer primary key autoincrement not null, " +
ARTICLE_AUTHOR + " text, " + ARTICLE_AUTHOR + " text, " +
ARTICLE_DATE + " datetime, " + ARTICLE_DATE + " datetime, " +
ARTICLE_CONTENT + " text, " + ARTICLE_CONTENT + " text, " +
ARTICLE_TITLE + " text, " + ARTICLE_TITLE + " text, " +
ARTICLE_URL + " text, " + ARTICLE_URL + " text, " +
ARTICLE_ID + " integer, " + ARTICLE_ID + " integer, " +
ARCHIVE + " integer," + ARCHIVE + " integer," +
ARTICLE_SYNC + " integer," + ARTICLE_SYNC + " integer," +
ARTICLE_READAT + " integer," + ARTICLE_READAT + " integer," +
"UNIQUE (" + ARTICLE_URL + ")" + "UNIQUE (" + ARTICLE_URL + ")" +
");" ");"
); );
} }
public void truncateTables(SQLiteDatabase db) { public void truncateTables(SQLiteDatabase db) {
db.execSQL("DELETE FROM " + ARTICLE_TABLE + ";"); db.execSQL("DELETE FROM " + ARTICLE_TABLE + ";");
} }
} }

1
app/src/main/java/fr/gaulupeau/apps/Poche/BaseActionBarActivity.java
View File

@ -2,7 +2,6 @@ package fr.gaulupeau.apps.Poche;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Activity;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarActivity;

34
app/src/main/java/fr/gaulupeau/apps/Poche/Helpers.java
View File

@ -1,36 +1,32 @@
package fr.gaulupeau.apps.Poche; package fr.gaulupeau.apps.Poche;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient; import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.DefaultHttpClient;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
public class Helpers { public class Helpers {
public static final String PREFS_NAME = "InThePoche"; public static final String PREFS_NAME = "InThePoche";
public final static String zeroUpdate = "2011-01-01 00:00:00"; public final static String zeroUpdate = "2011-01-01 00:00:00";
public static String InputStreamtoString(InputStream is) public static String InputStreamtoString(InputStream is) {
{ String s = "", line = "";
String s = "",line="";
BufferedReader rd = new BufferedReader(new InputStreamReader(is)); BufferedReader rd = new BufferedReader(new InputStreamReader(is));
try{ try {
for(; ; rd.readLine()) for (; ; rd.readLine()) {
{ if ((line = rd.readLine()) != null) {
if((line = rd.readLine())!=null) s += line;
{ } else {
s +=line;
}else
{
break; break;
} }
} }
}catch (IOException e) { } catch (IOException e) {
// TODO: handle exception // TODO: handle exception
e.printStackTrace(); e.printStackTrace();
} }
@ -38,7 +34,7 @@ public class Helpers {
} }
public static String getInputStreamFromUrl(String url) { public static String getInputStreamFromUrl(String url) {
InputStream content = null; InputStream content;
String res = ""; String res = "";
try { try {
HttpGet httpGet = new HttpGet(url); HttpGet httpGet = new HttpGet(url);

94
app/src/main/java/fr/gaulupeau/apps/Poche/ListArticles.java
View File

@ -1,13 +1,8 @@
package fr.gaulupeau.apps.Poche; package fr.gaulupeau.apps.Poche;
import java.util.ArrayList;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.*;
import fr.gaulupeau.apps.InThePoche.R;
import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
@ -16,10 +11,21 @@ import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ListView; import android.widget.ListView;
import java.util.ArrayList;
import fr.gaulupeau.apps.InThePoche.R;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARCHIVE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_CONTENT;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_TABLE;
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.MY_ID;
public class ListArticles extends BaseActionBarActivity { public class ListArticles extends BaseActionBarActivity {
private ArrayList<Article> readArticlesInfo; private ArrayList<Article> readArticlesInfo;
private ListView readList;
private SQLiteDatabase database; private SQLiteDatabase database;
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@ -29,33 +35,33 @@ public class ListArticles extends BaseActionBarActivity {
setupList(false); setupList(false);
} }
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
database.close(); database.close();
} }
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.option_list, menu); inflater.inflate(R.menu.option_list, menu);
return true; return true;
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.menuShowAll: case R.id.menuShowAll:
setupList(true); setupList(true);
return true; return true;
case R.id.menuWipeDb: case R.id.menuWipeDb:
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(this); ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(this);
helper.truncateTables(database); helper.truncateTables(database);
setupList(false); setupList(false);
return true; return true;
default: default:
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
} }
public void setupDB() { public void setupDB() {
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(this); ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(this);
@ -63,38 +69,38 @@ public class ListArticles extends BaseActionBarActivity {
} }
public void setupList(Boolean showAll) { public void setupList(Boolean showAll) {
readList = (ListView) findViewById(R.id.liste_articles); ListView readList = (ListView) findViewById(R.id.liste_articles);
readArticlesInfo = new ArrayList<Article>(); readArticlesInfo = new ArrayList<Article>();
String filter = null; String filter = null;
if (showAll == false) { if (!showAll) {
filter = ARCHIVE + "=0"; filter = ARCHIVE + "=0";
} }
ReadingListAdapter ad = getAdapterQuery(filter, readArticlesInfo); ReadingListAdapter ad = getAdapterQuery(filter, readArticlesInfo);
readList.setAdapter(ad); readList.setAdapter(ad);
readList.setOnItemClickListener(new AdapterView.OnItemClickListener() { readList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Intent i = new Intent(getBaseContext(), ReadArticle.class); Intent i = new Intent(getBaseContext(), ReadArticle.class);
i.putExtra("id", (String) readArticlesInfo.get(position).id); i.putExtra("id", readArticlesInfo.get(position).id);
startActivity(i); startActivity(i);
} }
}); });
} }
public ReadingListAdapter getAdapterQuery(String filter, ArrayList<Article> articleInfo) { public ReadingListAdapter getAdapterQuery(String filter, ArrayList<Article> articleInfo) {
//Log.e("getAdapterQuery", "running query"); //Log.e("getAdapterQuery", "running query");
//String url, String domain, String id, String title, String content //String url, String domain, String id, String title, String content
String[] getStrColumns = new String[] {ARTICLE_URL, MY_ID, ARTICLE_TITLE, ARTICLE_CONTENT, ARCHIVE}; String[] getStrColumns = new String[]{ARTICLE_URL, MY_ID, ARTICLE_TITLE, ARTICLE_CONTENT, ARCHIVE};
Cursor ac = database.query( Cursor ac = database.query(
ARTICLE_TABLE, ARTICLE_TABLE,
getStrColumns, getStrColumns,
filter, null, null, null, ARTICLE_DATE + " DESC"); filter, null, null, null, ARTICLE_DATE + " DESC");
ac.moveToFirst(); ac.moveToFirst();
if(!ac.isAfterLast()) { if (!ac.isAfterLast()) {
do { do {
Article tempArticle = new Article(ac.getString(0),ac.getString(1),ac.getString(2),ac.getString(3),ac.getString(4)); Article tempArticle = new Article(ac.getString(0), ac.getString(1), ac.getString(2), ac.getString(3), ac.getString(4));
articleInfo.add(tempArticle); articleInfo.add(tempArticle);
} while (ac.moveToNext()); } while (ac.moveToNext());
} }

611
app/src/main/java/fr/gaulupeau/apps/Poche/Poche.java
View File

@ -8,38 +8,6 @@
package fr.gaulupeau.apps.Poche; package fr.gaulupeau.apps.Poche;
import fr.gaulupeau.apps.InThePoche.R;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.SecureRandom;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.text.DateFormat;
import java.util.Date;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.X509TrustManager;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
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.InputSource;
import org.xml.sax.SAXException;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
@ -55,40 +23,58 @@ import android.net.NetworkInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.Browser; import android.provider.Browser;
import android.text.Html;
import android.util.Base64; import android.util.Base64;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast; import android.widget.Toast;
import static fr.gaulupeau.apps.Poche.Helpers.PREFS_NAME;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_TABLE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_URL;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_TITLE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_CONTENT;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARCHIVE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_SYNC;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.security.SecureRandom;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.X509TrustManager;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import fr.gaulupeau.apps.InThePoche.R;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARCHIVE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_CONTENT;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_SYNC;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_TABLE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_TITLE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_URL;
import static fr.gaulupeau.apps.Poche.Helpers.PREFS_NAME;
/** /**
* Main activity class * Main activity class
*/ */
@TargetApi(Build.VERSION_CODES.FROYO) public class Poche extends Activity { @TargetApi(Build.VERSION_CODES.FROYO)
public class Poche extends Activity {
private static SQLiteDatabase database; private static SQLiteDatabase database;
Button btnDone;
Button btnGetPost; Button btnGetPost;
Button btnSync; Button btnSync;
Button btnSettings; Button btnSettings;
EditText editPocheUrl;
SharedPreferences settings; SharedPreferences settings;
static String apiUsername; static String apiUsername;
static String apiToken; static String apiToken;
@ -96,101 +82,99 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
String action; String action;
/**
* Called when the activity is first created.
* Will act differently depending on whether sharing or
* displaying information page.
*/
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Intent intent = getIntent();
Bundle extras = intent.getExtras();
action = intent.getAction();
getSettings();
// Find out if Sharing or if app has been launched from icon
if (action.equals(Intent.ACTION_SEND) && !pocheUrl.equals("http://")) {
setContentView(R.layout.main);
findViewById(R.id.btnSync).setVisibility(View.GONE);
findViewById(R.id.btnGetPost).setVisibility(View.GONE);
findViewById(R.id.progressBar1).setVisibility(View.VISIBLE);
final String pageUrl = extras.getString("android.intent.extra.TEXT");
// Vérification de la connectivité Internet
final ConnectivityManager conMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo();
if (activeNetwork != null && activeNetwork.isConnected()) {
// 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);
/** Called when the activity is first created. // Load the constructed URL in the browser
* Will act differently depending on whether sharing or Intent i = new Intent(Intent.ACTION_VIEW);
* displaying information page. */ i.setData(pocheSaveUrl.build());
public void onCreate(Bundle savedInstanceState) { i.putExtra(Browser.EXTRA_APPLICATION_ID, getPackageName());
super.onCreate(savedInstanceState); // If user has more then one browser installed give them a chance to
// select which one they want to use
Intent intent = getIntent(); startActivity(i);
Bundle extras = intent.getExtras(); // That is all this app needs to do, so call finish()
action = intent.getAction(); this.finish();
} else {
getSettings(); // Afficher alerte connectivité
// Find out if Sharing or if app has been launched from icon showToast(getString(R.string.txtNetOffline));
if (action.equals(Intent.ACTION_SEND) && pocheUrl != "http://") { }
setContentView(R.layout.main); } else {
findViewById(R.id.btnSync).setVisibility(View.GONE); setContentView(R.layout.main);
findViewById(R.id.btnGetPost).setVisibility(View.GONE);
findViewById(R.id.progressBar1).setVisibility(View.VISIBLE);
final String pageUrl = extras.getString("android.intent.extra.TEXT");
// Vérification de la connectivité Internet
final ConnectivityManager conMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo();
if (activeNetwork != null && activeNetwork.isConnected()) {
// 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));
}
}
else {
setContentView(R.layout.main);
checkAndHandleAfterUpdate(); checkAndHandleAfterUpdate();
btnSync = (Button)findViewById(R.id.btnSync); btnSync = (Button) findViewById(R.id.btnSync);
btnSync.setOnClickListener(new OnClickListener() { btnSync.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
// Vérification de la connectivité Internet // Vérification de la connectivité Internet
final ConnectivityManager conMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); final ConnectivityManager conMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo(); final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo();
if (pocheUrl == "http://") { if (pocheUrl.equals("http://")) {
showToast(getString(R.string.txtConfigNotSet)); showToast(getString(R.string.txtConfigNotSet));
} else if (activeNetwork != null && activeNetwork.isConnected()) { } else if (activeNetwork != null && activeNetwork.isConnected()) {
// Exécution de la synchro en arrière-plan // Exécution de la synchro en arrière-plan
findViewById(R.id.progressBar1).setVisibility(View.VISIBLE); findViewById(R.id.progressBar1).setVisibility(View.VISIBLE);
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
//pushRead(); //pushRead();
parseRSS(); parseRSS();
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
findViewById(R.id.progressBar1).setVisibility(View.GONE); findViewById(R.id.progressBar1).setVisibility(View.GONE);
} }
}); });
} }
}).start(); }).start();
} else { } else {
// Afficher alerte connectivité // Afficher alerte connectivité
showToast(getString(R.string.txtNetOffline)); showToast(getString(R.string.txtNetOffline));
} }
} }
}); });
btnGetPost = (Button)findViewById(R.id.btnGetPost); btnGetPost = (Button) findViewById(R.id.btnGetPost);
//updateUnread(); //updateUnread();
btnGetPost.setOnClickListener(new OnClickListener() { btnGetPost.setOnClickListener(new OnClickListener() {
@Override @Override
@ -199,20 +183,20 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
} }
}); });
btnSettings = (Button)findViewById(R.id.btnSettings); btnSettings = (Button) findViewById(R.id.btnSettings);
btnSettings.setOnClickListener(new OnClickListener() { btnSettings.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
startActivity(new Intent(getBaseContext(), Settings.class)); startActivity(new Intent(getBaseContext(), Settings.class));
} }
}); });
} }
} }
private void checkAndHandleAfterUpdate() { private void checkAndHandleAfterUpdate() {
SharedPreferences pref = getSharedPreferences(PREFS_NAME, 0); SharedPreferences pref = getSharedPreferences(PREFS_NAME, 0);
if (pref.getInt("update_checker",0) < 9) { if (pref.getInt("update_checker", 0) < 9) {
// Wipe Database, because we now save HTML content instead of plain text // Wipe Database, because we now save HTML content instead of plain text
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(this); ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(this);
database = helper.getReadableDatabase(); database = helper.getReadableDatabase();
@ -230,54 +214,50 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
pref.edit().putInt("update_checker", versionCode).commit(); pref.edit().putInt("update_checker", versionCode).commit();
} }
private void getSettings(){ private void getSettings() {
settings = getSharedPreferences(PREFS_NAME, 0); settings = getSharedPreferences(PREFS_NAME, 0);
pocheUrl = settings.getString("pocheUrl", "http://"); pocheUrl = settings.getString("pocheUrl", "http://");
apiUsername = settings.getString("APIUsername", ""); apiUsername = settings.getString("APIUsername", "");
apiToken = settings.getString("APIToken", ""); apiToken = settings.getString("APIToken", "");
} }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
getSettings(); getSettings();
if (! action.equals(Intent.ACTION_SEND)){ if (!action.equals(Intent.ACTION_SEND)) {
updateUnread(); updateUnread();
}
}
@Override
protected void onDestroy() {
super.onDestroy();
if (database != null) {
database.close();
} }
} }
private void updateUnread(){ @Override
runOnUiThread(new Runnable() { protected void onDestroy() {
public void run() super.onDestroy();
{ if (database != null) {
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(getApplicationContext()); database.close();
database = helper.getReadableDatabase(); }
int news = database.query(ARTICLE_TABLE, null, ARCHIVE + "=0", null, null, null, null).getCount(); }
btnGetPost.setText(String.format(getString(R.string.btnGetPost), news));
}
});
}
public void showToast(final String toast) private void updateUnread() {
{ runOnUiThread(new Runnable() {
runOnUiThread(new Runnable() { public void run() {
public void run() ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(getApplicationContext());
{ database = helper.getReadableDatabase();
Toast.makeText(Poche.this, toast, Toast.LENGTH_SHORT).show(); int news = database.query(ARTICLE_TABLE, null, ARCHIVE + "=0", null, null, null, null).getCount();
} btnGetPost.setText(String.format(getString(R.string.btnGetPost), news));
}); }
} });
}
private void showErrorMessage(final String message) public void showToast(final String toast) {
{ runOnUiThread(new Runnable() {
public void run() {
Toast.makeText(Poche.this, toast, Toast.LENGTH_SHORT).show();
}
});
}
private void showErrorMessage(final String message) {
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -285,7 +265,7 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
messageBox.setMessage(message); messageBox.setMessage(message);
messageBox.setTitle(getString(R.string.error)); messageBox.setTitle(getString(R.string.error));
// messageBox.setIconAttribute(android.R.attr.alertDialogIcon); // messageBox.setIconAttribute(android.R.attr.alertDialogIcon);
messageBox.setPositiveButton("OK",null); messageBox.setPositiveButton("OK", null);
messageBox.setCancelable(false); messageBox.setCancelable(false);
messageBox.create().show(); messageBox.create().show();
} }
@ -342,74 +322,79 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
// } // }
public String cleanString(String s){ public String cleanString(String s) {
s = s.replace("&Atilde;&copy;", "&eacute;"); s = s.replace("&Atilde;&copy;", "&eacute;");
s = s.replace("&Atilde;&uml;", "&egrave;"); s = s.replace("&Atilde;&uml;", "&egrave;");
s = s.replace("&Atilde;&ordf;", "&ecirc;"); s = s.replace("&Atilde;&ordf;", "&ecirc;");
s = s.replace("&Atilde;&laquo;", "&euml;"); s = s.replace("&Atilde;&laquo;", "&euml;");
s = s.replace("&Atilde;&nbsp;", "&agrave;"); s = s.replace("&Atilde;&nbsp;", "&agrave;");
s = s.replace("&Atilde;&curren;", "&auml;"); s = s.replace("&Atilde;&curren;", "&auml;");
s = s.replace("&Atilde;&cent;", "&acirc;"); s = s.replace("&Atilde;&cent;", "&acirc;");
s = s.replace("&Atilde;&sup1;", "&ugrave;"); s = s.replace("&Atilde;&sup1;", "&ugrave;");
s = s.replace("&Atilde;&raquo;", "&ucirc;"); s = s.replace("&Atilde;&raquo;", "&ucirc;");
s = s.replace("&Atilde;&frac14;", "&uuml;"); s = s.replace("&Atilde;&frac14;", "&uuml;");
s = s.replace("&Atilde;&acute;", "&ocirc;"); s = s.replace("&Atilde;&acute;", "&ocirc;");
s = s.replace("&Atilde;&para;", "&ouml;"); s = s.replace("&Atilde;&para;", "&ouml;");
s = s.replace("&Atilde;&reg;", "&icirc;"); s = s.replace("&Atilde;&reg;", "&icirc;");
s = s.replace("&Atilde;&macr;", "&iuml;"); s = s.replace("&Atilde;&macr;", "&iuml;");
s = s.replace("&Atilde;&sect;", "&ccedil;"); s = s.replace("&Atilde;&sect;", "&ccedil;");
s = s.replace("&amp;", "&amp;"); s = s.replace("&amp;", "&amp;");
return s; return s;
} }
private void trustEveryone() { private void trustEveryone() {
try { try {
HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier(){ HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
public boolean verify(String hostname, SSLSession session) { public boolean verify(String hostname, SSLSession session) {
return true; return true;
}}); }
SSLContext context = SSLContext.getInstance("TLS"); });
context.init(null, new X509TrustManager[]{new X509TrustManager(){ SSLContext context = SSLContext.getInstance("TLS");
public void checkClientTrusted(X509Certificate[] chain, context.init(null, new X509TrustManager[]{new X509TrustManager() {
String authType) throws CertificateException {} public void checkClientTrusted(X509Certificate[] chain,
public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
String authType) throws CertificateException {} }
public X509Certificate[] getAcceptedIssuers() {
return new X509Certificate[0]; public void checkServerTrusted(X509Certificate[] chain,
}}}, new SecureRandom()); String authType) throws CertificateException {
HttpsURLConnection.setDefaultSSLSocketFactory( }
context.getSocketFactory());
} catch (Exception e) { // should never happen public X509Certificate[] getAcceptedIssuers() {
e.printStackTrace(); return new X509Certificate[0];
} }
} }}, new SecureRandom());
HttpsURLConnection.setDefaultSSLSocketFactory(
context.getSocketFactory());
} catch (Exception e) { // should never happen
e.printStackTrace();
}
}
public void parseRSS(){ public void parseRSS() {
URL url; URL url;
try try {
{ // Set the url (you will need to change this to your RSS URL
// 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);
url = new URL(pocheUrl + "/?feed&type=home&user_id=" + apiUsername + "&token=" + apiToken);
if (pocheUrl.startsWith("https")) { if (pocheUrl.startsWith("https")) {
trustEveryone(); trustEveryone();
} }
// Setup the connection // Setup the connection
HttpURLConnection urlConnection = null; HttpURLConnection urlConnection;
urlConnection = (HttpURLConnection) url.openConnection(); urlConnection = (HttpURLConnection) url.openConnection();
if ((urlConnection != null) && (urlConnection.getResponseCode() == HttpURLConnection.HTTP_OK)) { if ((urlConnection != null) && (urlConnection.getResponseCode() == HttpURLConnection.HTTP_OK)) {
// Retreive the XML from the URL // Retreive the XML from the URL
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder(); DocumentBuilder db = dbf.newDocumentBuilder();
Document doc = null; Document doc = null;
InputSource is = null; InputSource is;
try { try {
is = new InputSource( is = new InputSource(
@ -429,106 +414,98 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
showErrorMessage("Got invalid response:\n\"" + stringBuffer.toString() + "\""); showErrorMessage("Got invalid response:\n\"" + stringBuffer.toString() + "\"");
} }
// This is the root node of each section you want to parse // This is the root node of each section you want to parse
NodeList itemLst = doc.getElementsByTagName("item"); NodeList itemLst = doc.getElementsByTagName("item");
// This sets up some arrays to hold the data parsed // This sets up some arrays to hold the data parsed
arrays.PodcastTitle = new String[itemLst.getLength()]; arrays.PodcastTitle = new String[itemLst.getLength()];
arrays.PodcastURL = new String[itemLst.getLength()]; arrays.PodcastURL = new String[itemLst.getLength()];
arrays.PodcastContent = new String[itemLst.getLength()]; arrays.PodcastContent = new String[itemLst.getLength()];
arrays.PodcastMedia = new String[itemLst.getLength()]; arrays.PodcastMedia = new String[itemLst.getLength()];
arrays.PodcastDate = new String[itemLst.getLength()]; arrays.PodcastDate = new String[itemLst.getLength()];
// Loop through the XML passing the data to the arrays // Loop through the XML passing the data to the arrays
for (int i = 0; i < itemLst.getLength(); i++) for (int i = 0; i < itemLst.getLength(); i++) {
{
Node item = itemLst.item(i); Node item = itemLst.item(i);
if (item.getNodeType() == Node.ELEMENT_NODE) if (item.getNodeType() == Node.ELEMENT_NODE) {
{ Element ielem = (Element) item;
Element ielem = (Element) item;
// This section gets the elements from the XML // This section gets the elements from the XML
// that we want to use you will need to add // that we want to use you will need to add
// and remove elements that you want / don't want // and remove elements that you want / don't want
NodeList title = ielem.getElementsByTagName("title"); NodeList title = ielem.getElementsByTagName("title");
NodeList link = ielem.getElementsByTagName("link"); NodeList link = ielem.getElementsByTagName("link");
NodeList date = ielem.getElementsByTagName("pubDate"); NodeList date = ielem.getElementsByTagName("pubDate");
NodeList content = ielem NodeList content = ielem
.getElementsByTagName("description"); .getElementsByTagName("description");
//NodeList media = ielem //NodeList media = ielem
// .getElementsByTagName("media:content"); // .getElementsByTagName("media:content");
// This is an attribute of an element so I create // This is an attribute of an element so I create
// a string to make it easier to use // a string to make it easier to use
//String mediaurl = media.item(0).getAttributes() //String mediaurl = media.item(0).getAttributes()
// .getNamedItem("url").getNodeValue(); // .getNamedItem("url").getNodeValue();
// This section adds an entry to the arrays with the // This section adds an entry to the arrays with the
// data retrieved from above. I have surrounded each // data retrieved from above. I have surrounded each
// with try/catch just incase the element does not // with try/catch just incase the element does not
// exist // exist
try try {
{ arrays.PodcastTitle[i] = cleanString(title.item(0).getChildNodes().item(0).getNodeValue());
arrays.PodcastTitle[i] = cleanString(title.item(0).getChildNodes().item(0).getNodeValue()); } catch (NullPointerException e) {
} catch (NullPointerException e) e.printStackTrace();
{ arrays.PodcastTitle[i] = "Echec";
e.printStackTrace(); }
arrays.PodcastTitle[i] = "Echec"; try {
}
try {
arrays.PodcastDate[i] = date.item(0).getChildNodes().item(0).getNodeValue(); arrays.PodcastDate[i] = date.item(0).getChildNodes().item(0).getNodeValue();
} catch (NullPointerException e) { } catch (NullPointerException e) {
e.printStackTrace(); e.printStackTrace();
arrays.PodcastDate[i] = null; arrays.PodcastDate[i] = null;
}
try {
arrays.PodcastURL[i] = link.item(0).getChildNodes()
.item(0).getNodeValue();
} catch (NullPointerException e) {
e.printStackTrace();
arrays.PodcastURL[i] = "Echec";
}
try {
arrays.PodcastContent[i] = content.item(0)
.getChildNodes().item(0).getNodeValue();
} catch (NullPointerException e) {
e.printStackTrace();
arrays.PodcastContent[i] = "Echec";
} }
try
{
arrays.PodcastURL[i] = link.item(0).getChildNodes()
.item(0).getNodeValue();
} catch (NullPointerException e)
{
e.printStackTrace();
arrays.PodcastURL[i] = "Echec";
}
try
{
arrays.PodcastContent[i] = content.item(0)
.getChildNodes().item(0).getNodeValue();
} catch (NullPointerException e)
{
e.printStackTrace();
arrays.PodcastContent[i] = "Echec";
}
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(ARTICLE_TITLE, arrays.PodcastTitle[i]); values.put(ARTICLE_TITLE, arrays.PodcastTitle[i]);
values.put(ARTICLE_CONTENT, arrays.PodcastContent[i]); values.put(ARTICLE_CONTENT, arrays.PodcastContent[i]);
//values.put(ARTICLE_ID, Html.fromHtml(article.getString("id")).toString()); //values.put(ARTICLE_ID, Html.fromHtml(article.getString("id")).toString());
values.put(ARTICLE_URL, arrays.PodcastURL[i]); values.put(ARTICLE_URL, arrays.PodcastURL[i]);
values.put(ARTICLE_DATE, arrays.PodcastDate[i]); values.put(ARTICLE_DATE, arrays.PodcastDate[i]);
values.put(ARCHIVE, 0); values.put(ARCHIVE, 0);
values.put(ARTICLE_SYNC, 0); values.put(ARTICLE_SYNC, 0);
try { try {
database.insertOrThrow(ARTICLE_TABLE, null, values); database.insertOrThrow(ARTICLE_TABLE, null, values);
} catch (SQLiteConstraintException e) { } catch (SQLiteConstraintException e) {
continue; continue;
} catch (SQLiteException e) { } catch (SQLiteException e) {
database.execSQL("ALTER TABLE " + ARTICLE_TABLE + " ADD COLUMN " + ARTICLE_DATE + " datetime;"); database.execSQL("ALTER TABLE " + ARTICLE_TABLE + " ADD COLUMN " + ARTICLE_DATE + " datetime;");
database.insertOrThrow(ARTICLE_TABLE, null, values); database.insertOrThrow(ARTICLE_TABLE, null, values);
} }
} }
} }
} }
showToast(getString(R.string.txtSyncDone)); showToast(getString(R.string.txtSyncDone));
updateUnread(); updateUnread();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
// public void fetchUnread(){ // public void fetchUnread(){
// String id = "req-001"; // String id = "req-001";

64
app/src/main/java/fr/gaulupeau/apps/Poche/ReadArticle.java
View File

@ -1,58 +1,45 @@
package fr.gaulupeau.apps.Poche; package fr.gaulupeau.apps.Poche;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARCHIVE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_CONTENT;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_ID;
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.annotation.TargetApi;
import android.app.Activity;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.View.OnTouchListener;
import android.view.Window;
import android.webkit.WebChromeClient;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Button; import android.widget.Button;
import android.widget.ScrollView; import android.widget.ScrollView;
import android.widget.TextView;
import java.net.URL; import java.net.URL;
import fr.gaulupeau.apps.InThePoche.R; import fr.gaulupeau.apps.InThePoche.R;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARCHIVE;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_AUTHOR;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_CONTENT;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_ID;
import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_TABLE;
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.MY_ID;
public class ReadArticle extends BaseActionBarActivity { public class ReadArticle extends BaseActionBarActivity {
WebView webViewContent; WebView webViewContent;
Button btnMarkRead; Button btnMarkRead;
SQLiteDatabase database; SQLiteDatabase database;
String id = ""; String id = "";
ScrollView view; ScrollView view;
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
requestWindowFeature(Window.FEATURE_PROGRESS);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.article); setContentView(R.layout.article);
view = (ScrollView) findViewById(R.id.scroll); view = (ScrollView) findViewById(R.id.scroll);
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(getApplicationContext()); ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(getApplicationContext());
database = helper.getWritableDatabase(); database = helper.getWritableDatabase();
String[] getStrColumns = new String[] {ARTICLE_URL, MY_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(); Bundle data = getIntent().getExtras();
if(data != null) { if (data != null) {
id = data.getString("id"); id = data.getString("id");
} }
Cursor ac = database.query(ARTICLE_TABLE, getStrColumns, MY_ID + "=" + id, null, null, null, null); Cursor ac = database.query(ARTICLE_TABLE, getStrColumns, MY_ID + "=" + id, null, null, null, null);
@ -66,8 +53,7 @@ public class ReadArticle extends BaseActionBarActivity {
try { try {
URL originalUrl = new URL(originalUrlText); URL originalUrl = new URL(originalUrlText);
originalUrlDesc = originalUrl.getHost(); originalUrlDesc = originalUrl.getHost();
} } catch (Exception e) {
catch (Exception e) {
// //
} }
@ -83,8 +69,8 @@ public class ReadArticle extends BaseActionBarActivity {
"\t\t\t\t<div id=\"content\" class=\"w600p center\">\n" + "\t\t\t\t<div id=\"content\" class=\"w600p center\">\n" +
"\t\t\t\t\t<div id=\"article\">\n" + "\t\t\t\t\t<div id=\"article\">\n" +
"\t\t\t\t\t\t<header class=\"mbm\">\n" + "\t\t\t\t\t\t<header class=\"mbm\">\n" +
"\t\t\t\t\t\t\t<h1>"+ titleText +"</h1>\n" + "\t\t\t\t\t\t\t<h1>" + titleText + "</h1>\n" +
"\t\t\t\t\t\t\t<p>Open Original: <a href=\""+ originalUrlText +"\">"+ originalUrlDesc +"</a></p>\n" + "\t\t\t\t\t\t\t<p>Open Original: <a href=\"" + originalUrlText + "\">" + originalUrlDesc + "</a></p>\n" +
"\t\t\t\t\t\t</header>\n" + "\t\t\t\t\t\t</header>\n" +
"\t\t\t\t\t\t<article>"; "\t\t\t\t\t\t<article>";
String htmlFooter = "</article>\n" + String htmlFooter = "</article>\n" +
@ -95,22 +81,10 @@ public class ReadArticle extends BaseActionBarActivity {
"</html>"; "</html>";
setProgressBarIndeterminateVisibility(true); webViewContent = (WebView) findViewById(R.id.webViewContent);
setProgressBarVisibility(true);
webViewContent = (WebView)findViewById(R.id.webViewContent);
webViewContent.setWebChromeClient(new WebChromeClient() {
public void onProgressChanged(WebView view, int progress) {
setProgress(progress * 100);
if(progress == 100) {
setProgressBarIndeterminateVisibility(false);
setProgressBarVisibility(false);
}
}
});
webViewContent.loadDataWithBaseURL("file:///android_asset/", htmlHeader + htmlContent + htmlFooter, "text/html", "utf-8", null); webViewContent.loadDataWithBaseURL("file:///android_asset/", htmlHeader + htmlContent + htmlFooter, "text/html", "utf-8", null);
btnMarkRead = (Button)findViewById(R.id.btnMarkRead); btnMarkRead = (Button) findViewById(R.id.btnMarkRead);
btnMarkRead.setOnClickListener(new OnClickListener() { btnMarkRead.setOnClickListener(new OnClickListener() {
@Override @Override

67
app/src/main/java/fr/gaulupeau/apps/Poche/ReadingListAdapter.java
View File

@ -1,56 +1,51 @@
package fr.gaulupeau.apps.Poche; package fr.gaulupeau.apps.Poche;
import java.util.List;
import fr.gaulupeau.apps.InThePoche.R;
import android.content.Context; import android.content.Context;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.TextView; import android.widget.TextView;
import java.util.List;
import fr.gaulupeau.apps.InThePoche.R;
public class ReadingListAdapter extends BaseAdapter { public class ReadingListAdapter extends BaseAdapter {
private Context context; private Context context;
private List<Article> listArticles; private List<Article> listArticles;
public ReadingListAdapter(Context context, List<Article> listArticles) { public ReadingListAdapter(Context context, List<Article> listArticles) {
this.context = context; this.context = context;
this.listArticles = listArticles; this.listArticles = listArticles;
} }
public int getCount() { public int getCount() {
return listArticles.size(); return listArticles.size();
} }
public Object getItem(int position) { public Object getItem(int position) {
return listArticles.get(position); return listArticles.get(position);
} }
public long getItemId(int position) { public long getItemId(int position) {
return position; return position;
} }
public View getView(int position, View convertView, ViewGroup parent) {
Article entry = listArticles.get(position);
if (convertView == null) {
LayoutInflater inflater = (LayoutInflater) context
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = inflater.inflate(R.layout.article_list, parent, false);
}
TextView tvTitle = (TextView) convertView.findViewById(R.id.listitem_titre);
TextView tvHost = (TextView) convertView.findViewById(R.id.listitem_textview_url);
tvTitle.setText(entry.title);
tvHost.setText(entry.getHostOfUrl());
return convertView;
}
public View getView(int position, View convertView, ViewGroup parent) {
Article entry = listArticles.get(position);
if (convertView == null) {
LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = inflater.inflate(R.layout.article_list, parent, false);
}
TextView tvTitle = (TextView) convertView.findViewById(R.id.listitem_titre);
TextView tvHost = (TextView) convertView.findViewById(R.id.listitem_textview_url);
tvTitle.setText(entry.title);
tvHost.setText(entry.getHostOfUrl());
return convertView;
}
} }

44
app/src/main/java/fr/gaulupeau/apps/Poche/Settings.java
View File

@ -1,24 +1,22 @@
package fr.gaulupeau.apps.Poche; package fr.gaulupeau.apps.Poche;
import static fr.gaulupeau.apps.Poche.Helpers.PREFS_NAME;
import fr.gaulupeau.apps.InThePoche.R;
import android.app.Activity;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
import fr.gaulupeau.apps.InThePoche.R;
import static fr.gaulupeau.apps.Poche.Helpers.PREFS_NAME;
public class Settings extends BaseActionBarActivity { public class Settings extends BaseActionBarActivity {
Button btnDone; Button btnDone;
EditText editPocheUrl; EditText editPocheUrl;
EditText editAPIUsername; EditText editAPIUsername;
EditText editAPIToken; EditText editAPIToken;
EditText editGlobalToken;
TextView textViewVersion; TextView textViewVersion;
@Override @Override
@ -26,28 +24,28 @@ public class Settings extends BaseActionBarActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.settings); setContentView(R.layout.settings);
SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0); SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
String pocheUrl = settings.getString("pocheUrl", "http://"); String pocheUrl = settings.getString("pocheUrl", "http://");
String apiUsername = settings.getString("APIUsername", ""); String apiUsername = settings.getString("APIUsername", "");
String apiToken = settings.getString("APIToken", ""); String apiToken = settings.getString("APIToken", "");
editPocheUrl = (EditText)findViewById(R.id.pocheUrl); editPocheUrl = (EditText) findViewById(R.id.pocheUrl);
editPocheUrl.setText(pocheUrl); editPocheUrl.setText(pocheUrl);
editAPIUsername = (EditText)findViewById(R.id.APIUsername); editAPIUsername = (EditText) findViewById(R.id.APIUsername);
editAPIUsername.setText(apiUsername); editAPIUsername.setText(apiUsername);
editAPIToken = (EditText)findViewById(R.id.APIToken); editAPIToken = (EditText) findViewById(R.id.APIToken);
editAPIToken.setText(apiToken); editAPIToken.setText(apiToken);
btnDone = (Button)findViewById(R.id.btnDone); btnDone = (Button) findViewById(R.id.btnDone);
btnDone.setOnClickListener(new OnClickListener() { btnDone.setOnClickListener(new OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0); SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
SharedPreferences.Editor editor = settings.edit(); SharedPreferences.Editor editor = settings.edit();
editor.putString("pocheUrl", editPocheUrl.getText().toString()); editor.putString("pocheUrl", editPocheUrl.getText().toString());
editor.putString("APIUsername", editAPIUsername.getText().toString()); editor.putString("APIUsername", editAPIUsername.getText().toString());
editor.putString("APIToken", editAPIToken.getText().toString()); editor.putString("APIToken", editAPIToken.getText().toString());
editor.commit(); editor.commit();
finish(); finish();
} }
}); });
try { try {
textViewVersion = (TextView) findViewById(R.id.version); textViewVersion = (TextView) findViewById(R.id.version);
textViewVersion.setText(getApplicationContext().getPackageManager().getPackageInfo(getApplicationContext().getPackageName(), 0).versionName); textViewVersion.setText(getApplicationContext().getPackageManager().getPackageInfo(getApplicationContext().getPackageName(), 0).versionName);

10
app/src/main/java/fr/gaulupeau/apps/Poche/arrays.java
View File

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