Merge pull request #47 from kevmeyer/rss-feed
Updating ActionBarTheme, added error messages
This commit is contained in:
Thomas Citharel
commit
ba95bea59a
|
|
@ -10,5 +10,4 @@ gen/
|
|||
.idea/
|
||||
.gradle/
|
||||
build/
|
||||
gradle/
|
||||
local.properties
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
language: android
|
||||
android:
|
||||
components:
|
||||
# Uncomment the lines below if you want to
|
||||
# use the latest revision of Android SDK Tools
|
||||
- platform-tools
|
||||
- tools
|
||||
|
||||
# The BuildTools version used by your project
|
||||
- build-tools-21.0.0
|
||||
|
||||
# The SDK version used to compile your project
|
||||
- android-21
|
||||
|
||||
# Additional components
|
||||
# - extra-google-google_play_services
|
||||
# - extra-google-m2repository
|
||||
# - extra-android-m2repository
|
||||
# - addon-google_apis-google-19
|
||||
|
||||
# Specify at least one system image,
|
||||
# if you need to run emulator(s) during your tests
|
||||
# - sys-img-armeabi-v7a-android-19
|
||||
# - sys-img-x86-android-17
|
||||
|
||||
script: ./gradlew build check
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
# wallabag - Android App [](https://travis-ci.org/wallabag/android-app)
|
||||
|
||||
wallabag app for Android, originally written by Jonathan GAULUPEAU <jo.gaulupeau-at-gmail.com>
|
||||
|
||||
Android application to add post to wallabag <https://www.wallabag.org>
|
||||
15
app/app.iml
15
app/app.iml
|
|
@ -13,6 +13,7 @@
|
|||
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
|
||||
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
|
||||
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
|
||||
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
||||
|
|
@ -37,22 +38,22 @@
|
|||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
|
||||
|
|
@ -77,11 +78,11 @@
|
|||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" exported="" name="appcompat-v7-20.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion 20
|
||||
buildToolsVersion '20'
|
||||
compileSdkVersion 21
|
||||
buildToolsVersion '21'
|
||||
|
||||
defaultConfig {
|
||||
applicationId "fr.gaulupeau.apps.InThePoche"
|
||||
minSdkVersion 8
|
||||
targetSdkVersion 20
|
||||
targetSdkVersion 21
|
||||
versionCode 9
|
||||
versionName "1.6"
|
||||
}
|
||||
|
|
@ -20,5 +20,5 @@ android {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
compile 'com.android.support:appcompat-v7:20.0.0'
|
||||
compile 'com.android.support:appcompat-v7:21.0.0'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package fr.gaulupeau.apps.Poche;
|
||||
|
||||
import java.net.URL;
|
||||
|
||||
public class Article {
|
||||
public String url;
|
||||
public String id;
|
||||
|
|
@ -7,6 +9,8 @@ public class Article {
|
|||
public String content;
|
||||
public String archive;
|
||||
|
||||
private URL m_url = null;
|
||||
|
||||
public Article(String url, String id, String title, String content, String archive) {
|
||||
super();
|
||||
this.url = url;
|
||||
|
|
@ -14,5 +18,18 @@ public class Article {
|
|||
this.title = title;
|
||||
this.content = content;
|
||||
this.archive = archive;
|
||||
|
||||
try {
|
||||
this.m_url = new URL(url);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public String getHostOfUrl() {
|
||||
if (this.m_url != null) {
|
||||
return m_url.getHost();
|
||||
}
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import android.content.Context;
|
|||
import android.content.SharedPreferences;
|
||||
import android.database.sqlite.SQLiteDatabase;
|
||||
import android.database.sqlite.SQLiteOpenHelper;
|
||||
|
||||
import static fr.gaulupeau.apps.Poche.Helpers.PREFS_NAME;
|
||||
import static fr.gaulupeau.apps.Poche.Helpers.zeroUpdate;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
package fr.gaulupeau.apps.Poche;
|
||||
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.support.v7.app.ActionBarActivity;
|
||||
import android.view.MenuItem;
|
||||
|
||||
public class BaseActionBarActivity extends ActionBarActivity {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
addBackButtonToActionBar();
|
||||
}
|
||||
|
||||
@TargetApi(11)
|
||||
protected void addBackButtonToActionBar() {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
|
||||
try {
|
||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
} catch (Exception e) {
|
||||
//
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
if (item.getItemId() == android.R.id.home) {
|
||||
this.finish();
|
||||
return true;
|
||||
}
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,36 +1,32 @@
|
|||
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.client.HttpClient;
|
||||
import org.apache.http.client.methods.HttpGet;
|
||||
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 static final String PREFS_NAME = "InThePoche";
|
||||
public final static String zeroUpdate = "2011-01-01 00:00:00";
|
||||
|
||||
public static String InputStreamtoString(InputStream is)
|
||||
{
|
||||
String s = "",line="";
|
||||
public static String InputStreamtoString(InputStream is) {
|
||||
String s = "", line = "";
|
||||
BufferedReader rd = new BufferedReader(new InputStreamReader(is));
|
||||
try{
|
||||
for(; ; rd.readLine())
|
||||
{
|
||||
if((line = rd.readLine())!=null)
|
||||
{
|
||||
s +=line;
|
||||
}else
|
||||
{
|
||||
try {
|
||||
for (; ; rd.readLine()) {
|
||||
if ((line = rd.readLine()) != null) {
|
||||
s += line;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}catch (IOException e) {
|
||||
} catch (IOException e) {
|
||||
// TODO: handle exception
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
@ -38,7 +34,7 @@ public class Helpers {
|
|||
}
|
||||
|
||||
public static String getInputStreamFromUrl(String url) {
|
||||
InputStream content = null;
|
||||
InputStream content;
|
||||
String res = "";
|
||||
try {
|
||||
HttpGet httpGet = new HttpGet(url);
|
||||
|
|
|
|||
|
|
@ -1,13 +1,8 @@
|
|||
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.database.Cursor;
|
||||
import android.database.sqlite.SQLiteDatabase;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
|
|
@ -16,33 +11,30 @@ import android.view.View;
|
|||
import android.widget.AdapterView;
|
||||
import android.widget.ListView;
|
||||
|
||||
public class ListArticles extends Activity {
|
||||
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 {
|
||||
|
||||
private ArrayList<Article> readArticlesInfo;
|
||||
private ListView readList;
|
||||
private SQLiteDatabase database;
|
||||
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.list);
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
|
||||
try {
|
||||
getActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
} catch (Exception e) {
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
setupDB();
|
||||
setupList(false);
|
||||
}
|
||||
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
setupList(false);
|
||||
}
|
||||
|
||||
public void onDestroy() {
|
||||
super.onDestroy();
|
||||
database.close();
|
||||
|
|
@ -60,15 +52,12 @@ public class ListArticles extends Activity {
|
|||
switch (item.getItemId()) {
|
||||
case R.id.menuShowAll:
|
||||
setupList(true);
|
||||
return super.onOptionsItemSelected(item);
|
||||
return true;
|
||||
case R.id.menuWipeDb:
|
||||
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(this);
|
||||
helper.truncateTables(database);
|
||||
setupList(false);
|
||||
return super.onOptionsItemSelected(item);
|
||||
case android.R.id.home:
|
||||
this.finish();
|
||||
return super.onOptionsItemSelected(item);
|
||||
return true;
|
||||
default:
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
|
@ -80,10 +69,10 @@ public class ListArticles extends Activity {
|
|||
}
|
||||
|
||||
public void setupList(Boolean showAll) {
|
||||
readList = (ListView) findViewById(R.id.liste_articles);
|
||||
ListView readList = (ListView) findViewById(R.id.liste_articles);
|
||||
readArticlesInfo = new ArrayList<Article>();
|
||||
String filter = null;
|
||||
if (showAll == false) {
|
||||
if (!showAll) {
|
||||
filter = ARCHIVE + "=0";
|
||||
}
|
||||
ReadingListAdapter ad = getAdapterQuery(filter, readArticlesInfo);
|
||||
|
|
@ -93,7 +82,7 @@ public class ListArticles extends Activity {
|
|||
|
||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
||||
Intent i = new Intent(getBaseContext(), ReadArticle.class);
|
||||
i.putExtra("id", (String) readArticlesInfo.get(position).id);
|
||||
i.putExtra("id", readArticlesInfo.get(position).id);
|
||||
startActivity(i);
|
||||
}
|
||||
|
||||
|
|
@ -103,15 +92,15 @@ 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, MY_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,
|
||||
filter, null, null, null, ARTICLE_DATE + " DESC");
|
||||
ac.moveToFirst();
|
||||
if(!ac.isAfterLast()) {
|
||||
if (!ac.isAfterLast()) {
|
||||
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);
|
||||
} while (ac.moveToNext());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,39 +8,9 @@
|
|||
|
||||
package fr.gaulupeau.apps.Poche;
|
||||
|
||||
import fr.gaulupeau.apps.InThePoche.R;
|
||||
|
||||
import java.io.IOException;
|
||||
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.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.content.ContentValues;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
|
@ -53,39 +23,61 @@ import android.net.NetworkInfo;
|
|||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.provider.Browser;
|
||||
import android.text.Html;
|
||||
import android.util.Base64;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
import android.view.MenuItem;
|
||||
import android.util.Patterns;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.widget.Button;
|
||||
import android.widget.EditText;
|
||||
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 java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
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
|
||||
*/
|
||||
@TargetApi(Build.VERSION_CODES.FROYO) public class Poche extends Activity {
|
||||
@TargetApi(Build.VERSION_CODES.FROYO)
|
||||
public class Poche extends Activity {
|
||||
private static SQLiteDatabase database;
|
||||
Button btnDone;
|
||||
Button btnGetPost;
|
||||
Button btnSync;
|
||||
Button btnSettings;
|
||||
EditText editPocheUrl;
|
||||
SharedPreferences settings;
|
||||
static String apiUsername;
|
||||
static String apiToken;
|
||||
|
|
@ -93,12 +85,11 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
String action;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/** Called when the activity is first created.
|
||||
/**
|
||||
* Called when the activity is first created.
|
||||
* Will act differently depending on whether sharing or
|
||||
* displaying information page. */
|
||||
* displaying information page.
|
||||
*/
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
|
|
@ -108,12 +99,27 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
|
||||
getSettings();
|
||||
// Find out if Sharing or if app has been launched from icon
|
||||
if (action.equals(Intent.ACTION_SEND) && pocheUrl != "http://") {
|
||||
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");
|
||||
|
||||
|
||||
|
||||
final String extraText = extras.getString("android.intent.extra.TEXT");
|
||||
final String pageUrl;
|
||||
|
||||
// Parsing string for urls.
|
||||
Matcher matcher = Patterns.WEB_URL.matcher(extraText);
|
||||
if (matcher.find()) {
|
||||
pageUrl = matcher.group();
|
||||
} else {
|
||||
showErrorMessage("Couldn't find a URL in share string:\n"+extraText);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// Vérification de la connectivité Internet
|
||||
final ConnectivityManager conMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo();
|
||||
|
|
@ -148,19 +154,18 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
// Afficher alerte connectivité
|
||||
showToast(getString(R.string.txtNetOffline));
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
setContentView(R.layout.main);
|
||||
checkAndHandleAfterUpdate();
|
||||
|
||||
btnSync = (Button)findViewById(R.id.btnSync);
|
||||
btnSync = (Button) findViewById(R.id.btnSync);
|
||||
btnSync.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
// Vérification de la connectivité Internet
|
||||
final ConnectivityManager conMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo();
|
||||
if (pocheUrl == "http://") {
|
||||
if (pocheUrl.equals("http://")) {
|
||||
showToast(getString(R.string.txtConfigNotSet));
|
||||
} else if (activeNetwork != null && activeNetwork.isConnected()) {
|
||||
// Exécution de la synchro en arrière-plan
|
||||
|
|
@ -186,7 +191,7 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
}
|
||||
});
|
||||
|
||||
btnGetPost = (Button)findViewById(R.id.btnGetPost);
|
||||
btnGetPost = (Button) findViewById(R.id.btnGetPost);
|
||||
//updateUnread();
|
||||
|
||||
btnGetPost.setOnClickListener(new OnClickListener() {
|
||||
|
|
@ -196,7 +201,7 @@ 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() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
|
|
@ -209,7 +214,7 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
private void checkAndHandleAfterUpdate() {
|
||||
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
|
||||
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(this);
|
||||
database = helper.getReadableDatabase();
|
||||
|
|
@ -227,7 +232,7 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
pref.edit().putInt("update_checker", versionCode).commit();
|
||||
}
|
||||
|
||||
private void getSettings(){
|
||||
private void getSettings() {
|
||||
settings = getSharedPreferences(PREFS_NAME, 0);
|
||||
pocheUrl = settings.getString("pocheUrl", "http://");
|
||||
apiUsername = settings.getString("APIUsername", "");
|
||||
|
|
@ -238,7 +243,7 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
protected void onResume() {
|
||||
super.onResume();
|
||||
getSettings();
|
||||
if (! action.equals(Intent.ACTION_SEND)){
|
||||
if (!action.equals(Intent.ACTION_SEND)) {
|
||||
updateUnread();
|
||||
}
|
||||
}
|
||||
|
|
@ -251,10 +256,9 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
}
|
||||
}
|
||||
|
||||
private void updateUnread(){
|
||||
private void updateUnread() {
|
||||
runOnUiThread(new Runnable() {
|
||||
public void run()
|
||||
{
|
||||
public void run() {
|
||||
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(getApplicationContext());
|
||||
database = helper.getReadableDatabase();
|
||||
int news = database.query(ARTICLE_TABLE, null, ARCHIVE + "=0", null, null, null, null).getCount();
|
||||
|
|
@ -263,16 +267,28 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
});
|
||||
}
|
||||
|
||||
public void showToast(final String toast)
|
||||
{
|
||||
public void showToast(final String toast) {
|
||||
runOnUiThread(new Runnable() {
|
||||
public void run()
|
||||
{
|
||||
public void run() {
|
||||
Toast.makeText(Poche.this, toast, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void showErrorMessage(final String message) {
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
AlertDialog.Builder messageBox = new AlertDialog.Builder(Poche.this);
|
||||
messageBox.setMessage(message);
|
||||
messageBox.setTitle(getString(R.string.error));
|
||||
// messageBox.setIconAttribute(android.R.attr.alertDialogIcon);
|
||||
messageBox.setPositiveButton("OK", null);
|
||||
messageBox.setCancelable(false);
|
||||
messageBox.create().show();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// public void pocheIt(String url){
|
||||
// String id ="req-001";
|
||||
|
|
@ -324,7 +340,7 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
// }
|
||||
|
||||
|
||||
public String cleanString(String s){
|
||||
public String cleanString(String s) {
|
||||
|
||||
s = s.replace("é", "é");
|
||||
s = s.replace("è", "è");
|
||||
|
|
@ -342,25 +358,36 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
s = s.replace("ï", "ï");
|
||||
s = s.replace("ç", "ç");
|
||||
s = s.replace("&", "&");
|
||||
|
||||
// Replace multiple whitespaces with single space
|
||||
s = s.replaceAll("\\s+", " ");
|
||||
s = s.trim();
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
|
||||
private void trustEveryone() {
|
||||
try {
|
||||
HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier(){
|
||||
HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
|
||||
public boolean verify(String hostname, SSLSession session) {
|
||||
return true;
|
||||
}});
|
||||
}
|
||||
});
|
||||
SSLContext context = SSLContext.getInstance("TLS");
|
||||
context.init(null, new X509TrustManager[]{new X509TrustManager(){
|
||||
context.init(null, new X509TrustManager[]{new X509TrustManager() {
|
||||
public void checkClientTrusted(X509Certificate[] chain,
|
||||
String authType) throws CertificateException {}
|
||||
String authType) throws CertificateException {
|
||||
}
|
||||
|
||||
public void checkServerTrusted(X509Certificate[] chain,
|
||||
String authType) throws CertificateException {}
|
||||
String authType) throws CertificateException {
|
||||
}
|
||||
|
||||
public X509Certificate[] getAcceptedIssuers() {
|
||||
return new X509Certificate[0];
|
||||
}}}, new SecureRandom());
|
||||
}
|
||||
}}, new SecureRandom());
|
||||
HttpsURLConnection.setDefaultSSLSocketFactory(
|
||||
context.getSocketFactory());
|
||||
} catch (Exception e) { // should never happen
|
||||
|
|
@ -369,45 +396,46 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
}
|
||||
|
||||
|
||||
public void parseRSS(){
|
||||
public void parseRSS() {
|
||||
|
||||
URL url;
|
||||
try
|
||||
{
|
||||
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 );
|
||||
// Setup the connection
|
||||
HttpsURLConnection conn_s = null;
|
||||
HttpURLConnection conn = null;
|
||||
if (pocheUrl.startsWith("https") ) {
|
||||
url = new URL(pocheUrl + "/?feed&type=home&user_id=" + apiUsername + "&token=" + apiToken);
|
||||
if (pocheUrl.startsWith("https")) {
|
||||
trustEveryone();
|
||||
conn_s = (HttpsURLConnection) url.openConnection();
|
||||
}else{
|
||||
conn = (HttpURLConnection) url.openConnection();
|
||||
}
|
||||
|
||||
if (
|
||||
((conn != null) && (conn.getResponseCode() == HttpURLConnection.HTTP_OK))
|
||||
|| ((conn_s != null) && (conn_s.getResponseCode() == HttpURLConnection.HTTP_OK))
|
||||
)
|
||||
{
|
||||
// Setup the connection
|
||||
HttpURLConnection urlConnection;
|
||||
urlConnection = (HttpURLConnection) url.openConnection();
|
||||
|
||||
if ((urlConnection != null) && (urlConnection.getResponseCode() == HttpURLConnection.HTTP_OK)) {
|
||||
|
||||
// Retreive the XML from the URL
|
||||
DocumentBuilderFactory dbf = DocumentBuilderFactory
|
||||
.newInstance();
|
||||
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
|
||||
DocumentBuilder db = dbf.newDocumentBuilder();
|
||||
Document doc;
|
||||
// doc = db.parse(url.openStream());
|
||||
InputSource is = new InputSource(
|
||||
Document doc = null;
|
||||
|
||||
InputSource is;
|
||||
|
||||
try {
|
||||
is = new InputSource(
|
||||
new InputStreamReader(
|
||||
url.openStream()));
|
||||
urlConnection.getInputStream()));
|
||||
doc = db.parse(is);
|
||||
// doc = db.parse(
|
||||
// new InputSource(
|
||||
// new InputStreamReader(
|
||||
// url.openStream(),
|
||||
// "latin-1")));
|
||||
doc.getDocumentElement().normalize();
|
||||
} catch (SAXException e) {
|
||||
e.printStackTrace();
|
||||
|
||||
InputStream inputStream = url.openStream();
|
||||
int ch;
|
||||
StringBuffer stringBuffer = new StringBuffer();
|
||||
while ((ch = inputStream.read()) != -1) {
|
||||
stringBuffer.append((char) ch);
|
||||
}
|
||||
showErrorMessage("Got invalid response:\n\"" + stringBuffer.toString() + "\"");
|
||||
}
|
||||
|
||||
// This is the root node of each section you want to parse
|
||||
NodeList itemLst = doc.getElementsByTagName("item");
|
||||
|
|
@ -420,12 +448,10 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
arrays.PodcastDate = new String[itemLst.getLength()];
|
||||
|
||||
// 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);
|
||||
if (item.getNodeType() == Node.ELEMENT_NODE)
|
||||
{
|
||||
if (item.getNodeType() == Node.ELEMENT_NODE) {
|
||||
Element ielem = (Element) item;
|
||||
|
||||
// This section gets the elements from the XML
|
||||
|
|
@ -448,11 +474,9 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
// data retrieved from above. I have surrounded each
|
||||
// with try/catch just incase the element does not
|
||||
// exist
|
||||
try
|
||||
{
|
||||
try {
|
||||
arrays.PodcastTitle[i] = cleanString(title.item(0).getChildNodes().item(0).getNodeValue());
|
||||
} catch (NullPointerException e)
|
||||
{
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
arrays.PodcastTitle[i] = "Echec";
|
||||
}
|
||||
|
|
@ -462,21 +486,17 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
e.printStackTrace();
|
||||
arrays.PodcastDate[i] = null;
|
||||
}
|
||||
try
|
||||
{
|
||||
try {
|
||||
arrays.PodcastURL[i] = link.item(0).getChildNodes()
|
||||
.item(0).getNodeValue();
|
||||
} catch (NullPointerException e)
|
||||
{
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
arrays.PodcastURL[i] = "Echec";
|
||||
}
|
||||
try
|
||||
{
|
||||
try {
|
||||
arrays.PodcastContent[i] = content.item(0)
|
||||
.getChildNodes().item(0).getNodeValue();
|
||||
} catch (NullPointerException e)
|
||||
{
|
||||
} catch (NullPointerException e) {
|
||||
e.printStackTrace();
|
||||
arrays.PodcastContent[i] = "Echec";
|
||||
}
|
||||
|
|
@ -500,24 +520,16 @@ import static fr.gaulupeau.apps.Poche.ArticlesSQLiteOpenHelper.ARTICLE_DATE;
|
|||
}
|
||||
}
|
||||
|
||||
}
|
||||
showToast(getString(R.string.txtSyncDone));
|
||||
} else {
|
||||
// HTTP Connection not successful
|
||||
if (urlConnection == null) {
|
||||
showErrorMessage(getString(R.string.error_feed));
|
||||
} else {
|
||||
showErrorMessage(getString(R.string.error_feed) + ":\n" + urlConnection.getResponseCode() + " " + urlConnection.getResponseMessage());
|
||||
}
|
||||
}
|
||||
updateUnread();
|
||||
} 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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +1,29 @@
|
|||
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.app.Activity;
|
||||
import android.content.ContentValues;
|
||||
import android.content.Context;
|
||||
import android.database.Cursor;
|
||||
import android.database.sqlite.SQLiteDatabase;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.view.MenuItem;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
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.WebViewClient;
|
||||
import android.widget.Button;
|
||||
import android.widget.ScrollView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import java.net.URL;
|
||||
|
||||
import fr.gaulupeau.apps.InThePoche.R;
|
||||
|
||||
public class ReadArticle extends Activity {
|
||||
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 {
|
||||
WebView webViewContent;
|
||||
Button btnMarkRead;
|
||||
SQLiteDatabase database;
|
||||
|
|
@ -42,24 +32,14 @@ public class ReadArticle extends Activity {
|
|||
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
|
||||
requestWindowFeature(Window.FEATURE_PROGRESS);
|
||||
setContentView(R.layout.article);
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
|
||||
try {
|
||||
getActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
} catch (Exception e) {
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
view = (ScrollView) findViewById(R.id.scroll);
|
||||
ArticlesSQLiteOpenHelper helper = new ArticlesSQLiteOpenHelper(getApplicationContext());
|
||||
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();
|
||||
if(data != null) {
|
||||
if (data != null) {
|
||||
id = data.getString("id");
|
||||
}
|
||||
Cursor ac = database.query(ARTICLE_TABLE, getStrColumns, MY_ID + "=" + id, null, null, null, null);
|
||||
|
|
@ -73,8 +53,7 @@ public class ReadArticle extends Activity {
|
|||
try {
|
||||
URL originalUrl = new URL(originalUrlText);
|
||||
originalUrlDesc = originalUrl.getHost();
|
||||
}
|
||||
catch (Exception e) {
|
||||
} catch (Exception e) {
|
||||
//
|
||||
}
|
||||
|
||||
|
|
@ -90,8 +69,8 @@ public class ReadArticle extends Activity {
|
|||
"\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\t<header class=\"mbm\">\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<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</header>\n" +
|
||||
"\t\t\t\t\t\t<article>";
|
||||
String htmlFooter = "</article>\n" +
|
||||
|
|
@ -102,22 +81,10 @@ public class ReadArticle extends Activity {
|
|||
"</html>";
|
||||
|
||||
|
||||
setProgressBarIndeterminateVisibility(true);
|
||||
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 = (WebView) findViewById(R.id.webViewContent);
|
||||
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() {
|
||||
|
||||
@Override
|
||||
|
|
@ -148,15 +115,4 @@ public class ReadArticle extends Activity {
|
|||
super.onDestroy();
|
||||
database.close();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case android.R.id.home:
|
||||
this.finish();
|
||||
return super.onOptionsItemSelected(item);
|
||||
default:
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,16 @@
|
|||
package fr.gaulupeau.apps.Poche;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import fr.gaulupeau.apps.InThePoche.R;
|
||||
|
||||
import android.content.Context;
|
||||
import android.text.Html;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.BaseAdapter;
|
||||
import android.widget.TextView;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import fr.gaulupeau.apps.InThePoche.R;
|
||||
|
||||
public class ReadingListAdapter extends BaseAdapter {
|
||||
private Context context;
|
||||
private List<Article> listArticles;
|
||||
|
|
@ -37,18 +36,16 @@ public class ReadingListAdapter extends BaseAdapter {
|
|||
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, 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);
|
||||
//Log.e("title", entry.title);
|
||||
TextView tvHost = (TextView) convertView.findViewById(R.id.listitem_textview_url);
|
||||
|
||||
tvTitle.setText(entry.title);
|
||||
tvHost.setText(entry.getHostOfUrl());
|
||||
|
||||
return convertView;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,22 @@
|
|||
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.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.widget.Button;
|
||||
import android.widget.EditText;
|
||||
import android.widget.TextView;
|
||||
|
||||
public class Settings extends Activity {
|
||||
import fr.gaulupeau.apps.InThePoche.R;
|
||||
|
||||
import static fr.gaulupeau.apps.Poche.Helpers.PREFS_NAME;
|
||||
|
||||
public class Settings extends BaseActionBarActivity {
|
||||
Button btnDone;
|
||||
EditText editPocheUrl;
|
||||
EditText editAPIUsername;
|
||||
EditText editAPIToken;
|
||||
EditText editGlobalToken;
|
||||
TextView textViewVersion;
|
||||
|
||||
@Override
|
||||
|
|
@ -26,25 +24,17 @@ public class Settings extends Activity {
|
|||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.settings);
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
|
||||
try {
|
||||
getActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
} catch (Exception e) {
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
|
||||
String pocheUrl = settings.getString("pocheUrl", "http://");
|
||||
String apiUsername = settings.getString("APIUsername", "");
|
||||
String apiToken = settings.getString("APIToken", "");
|
||||
editPocheUrl = (EditText)findViewById(R.id.pocheUrl);
|
||||
editPocheUrl = (EditText) findViewById(R.id.pocheUrl);
|
||||
editPocheUrl.setText(pocheUrl);
|
||||
editAPIUsername = (EditText)findViewById(R.id.APIUsername);
|
||||
editAPIUsername = (EditText) findViewById(R.id.APIUsername);
|
||||
editAPIUsername.setText(apiUsername);
|
||||
editAPIToken = (EditText)findViewById(R.id.APIToken);
|
||||
editAPIToken = (EditText) findViewById(R.id.APIToken);
|
||||
editAPIToken.setText(apiToken);
|
||||
btnDone = (Button)findViewById(R.id.btnDone);
|
||||
btnDone = (Button) findViewById(R.id.btnDone);
|
||||
btnDone.setOnClickListener(new OnClickListener() {
|
||||
public void onClick(View v) {
|
||||
SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
|
||||
|
|
@ -63,15 +53,4 @@ public class Settings extends Activity {
|
|||
//
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case android.R.id.home:
|
||||
this.finish();
|
||||
return true;
|
||||
default:
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 7.5 KiB |
|
|
@ -10,7 +10,8 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical" >
|
||||
android:orientation="vertical"
|
||||
tools:ignore="WebViewLayout" >
|
||||
|
||||
<WebView
|
||||
android:id="@+id/webViewContent"
|
||||
|
|
|
|||
|
|
@ -1,14 +1,22 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical" android:padding="10sp"
|
||||
android:orientation="vertical" android:padding="8sp"
|
||||
android:layout_width="fill_parent" android:layout_height="fill_parent" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/listitem_titre"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="20sp"
|
||||
android:typeface="serif" />
|
||||
android:textSize="18sp"
|
||||
android:textColor="@android:color/black"
|
||||
android:paddingBottom="4sp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/listitem_textview_url"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="12sp"
|
||||
android:singleLine="true" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
<string name="author">GAULUPEAU Jonathan - 2013</string>
|
||||
<string name="instructions">Um eine Website zu speichern benutze einfach den <i>Teilen</i> Button deines Browsers und drücke dann auf <i>Bag it!</i>.\nDann wirst du zur Login-Seite deiner wallabag weitergeleitet. \nFertig!\nErfahre mehr über wallabag auf:\n http://www.wallabag.org</string>
|
||||
<string name="btnDone">Speichern</string>
|
||||
<string name="which_browser">Welchen Browser möchtest du benutzen?</string>
|
||||
<string name="authorSite">http://cv.gaulupeau.fr</string>
|
||||
<string name="url_label"><b><u>Deine wallabag URL:</u></b></string>
|
||||
<string name="url_help">Beispiele:\n<i>http://wallabag.example.com</i>\n<i>http://www.example.com/wallabag</i></string>
|
||||
<string name="btnGetPost">Artikelliste - %1$d ungelesene</string>
|
||||
|
|
@ -17,10 +15,10 @@
|
|||
<string name="menuShowAll">Alle anzeigen</string>
|
||||
<string name="menuWipeDb">Datenbank leeren</string>
|
||||
<string name="txtSyncDone">Synchronisieren erfolgreich!</string>
|
||||
<string name="txtSyncFailed">Synchronisieren fehlgeschlagen!</string>
|
||||
<string name="txtNetOffline">Internetverbindung prüfen!</string>
|
||||
<string name="txtConfigNotSet">Bitte konfiguriere die App zunächst!</string>
|
||||
<string name="txtGlobalToken"><b><u>Globales API Token:</u></b></string>
|
||||
<string name="txtAPIUsername"><b><u>Deine User ID:</u></b></string>
|
||||
<string name="txtAPIToken"><b><u>Dein Token:</u></b></string>
|
||||
<string name="error">Fehler</string>
|
||||
<string name="error_feed">Fehler beim laden des Feeds</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="app_theme" parent="android:Theme.Holo.Light"/>
|
||||
<style name="mainActivity_theme" parent="android:Theme.Holo.Light" />
|
||||
</resources>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="app_theme" parent="android:Theme.DeviceDefault.Light.DarkActionBar"/>
|
||||
<style name="mainActivity_theme" parent="android:Theme.DeviceDefault.Light.NoActionBar" />
|
||||
</resources>
|
||||
|
|
@ -6,8 +6,6 @@
|
|||
<string name="author">GAULUPEAU Jonathan - 2013</string>
|
||||
<string name="instructions">To save a web page to wallabag, open the page in a browser then tap <i>Share</i> and tap on <i>Bag it!</i>. \nYou could then see your wallabag login page. \nAnd it\'s done ! \nMore infos about wallabag at:\n http://www.wallabag.org</string>
|
||||
<string name="btnDone">Save</string>
|
||||
<string name="which_browser">Which browser would you like to use?</string>
|
||||
<string name="authorSite">http://cv.gaulupeau.fr</string>
|
||||
<string name="url_label"><b><u>Your wallabag URL :</u></b></string>
|
||||
<string name="url_help">Examples:\n<i>http://wallabag.example.fr</i>\n<i>http://www.example.fr/wallabag</i></string>
|
||||
<string name="btnGetPost">List articles - %1$d unread</string>
|
||||
|
|
@ -17,10 +15,10 @@
|
|||
<string name="menuShowAll">Show All</string>
|
||||
<string name="menuWipeDb">Wipe Database</string>
|
||||
<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 User ID:</u></b></string>
|
||||
<string name="txtAPIToken"><b><u>Your Token:</u></b></string>
|
||||
<string name="error">Error</string>
|
||||
<string name="error_feed">Error loading feed</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="app_theme" parent="android:Theme.Light"/>
|
||||
<style name="mainActivity_theme" parent="android:Theme.Light.NoTitleBar" />
|
||||
<style name="app_theme" parent="Theme.AppCompat.Light.DarkActionBar"/>
|
||||
<style name="mainActivity_theme" parent="Theme.AppCompat.Light.NoActionBar" />
|
||||
</resources>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1,6 @@
|
|||
#Sun Jun 22 17:29:26 CEST 2014
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
|
||||
Loading…
Reference in New Issue