refresh for #132

wallabag · Nov 16, 2015 · 3d32ace · 3d32ace
1 parent 5d7d534
commit 3d32ace
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         applicationId "fr.gaulupeau.apps.InThePoche"
         minSdkVersion 8
         targetSdkVersion 23
-        versionCode 15
+        versionCode 16
         versionName "1.9"
     }
 

diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/SettingsActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/SettingsActivity.java
@@ -2,6 +2,7 @@
 
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
@@ -44,6 +45,7 @@ public class SettingsActivity extends BaseActionBarActivity {
 	EditText httpAuthUsername;
 	EditText httpAuthPassword;
 	ProgressDialog progressDialog;
+	Intent starterIntent;
 
     private Settings settings;
 	private WallabagSettings wallabagSettings;
@@ -79,7 +81,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		allCerts.setChecked(settings.getBoolean(Settings.ALL_CERTS, false));
 		highContrast.setChecked(settings.getBoolean(Settings.HIGH_CONTRAST,
 				android.os.Build.MODEL.equals("NOOK")));
-        nightmode.setChecked(settings.getBoolean(Settings.NIGHTMODE,false));
+        nightmode.setChecked(settings.getBoolean(Settings.NIGHTMODE, false));
 		listLimit.setText(String.valueOf(settings.getInt(Settings.LIST_LIMIT, 50)));
 
 		username = (EditText) findViewById(R.id.username);
@@ -157,6 +159,7 @@ public void onClick(View v) {
 		});
 
 		btnDone = (Button) findViewById(R.id.btnDone);
+		starterIntent = new Intent(this,ArticlesListActivity.class);
 		btnDone.setOnClickListener(new OnClickListener() {
 			public void onClick(View v) {
 				wallabagSettings.wallabagURL = editPocheUrl.getText().toString();
@@ -181,6 +184,7 @@ public void onClick(View v) {
 				if (wallabagSettings.isValid()) {
 					wallabagSettings.save();
 					finish();
+					startActivity(starterIntent);
 				}
 			}
 		});

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -11,9 +11,6 @@ GAULUPEAU Jonathan — 2013
 <string name="btnDone">Sauvegarder</string>
 <string name="url_label"><b><u>Votre URL wallabag:</u></b></string>
 <string name="url_help">Exemples:\n<i>http://wallabag.example.com</i>\n<i>http://www.example.com/wallabag</i></string>
-<string name="btnGetPost">Liste des articles - %1$d non-lus</string>
-<string name="btnFastSync">Synchronisation rapide</string>
-<string name="btnSync">Synchronisation</string>
 <string name="btnMarkRead">Marquer comme lu</string>
 <string name="btnMarkUnread">Marquer comme non lu</string>
 <string name="moved_to_archive_message">Archivé</string>
@@ -128,4 +125,6 @@ GAULUPEAU Jonathan — 2013
     <string name="settings_httpAuth_password">Mot de passe Authentification HTTP</string>
     <string name="settings_httpAuth_username">Identifiant Authentification HTTP</string>
     <string name="nightmode">Mode nuit</string>
+    <string name="noNextArticle">Il n\'y pas d\'article suivant dans la liste actuelle</string>
+    <string name="noPreviousArticle">Il n\'y pas d\'article précédent dans la liste actuelle</string>
 </resources>