diff --git a/README.md b/README.md index 94017f23..ca7986d0 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ wallabag is available on the Google Play Store and F-Droid. wallabag has been made for you to comfortably read and archive your articles. You can download wallabag from wallabag.org and follow the instructions to install it on your own server. -Alternatively, you can directly sign up for [wallabag.it](https://wallabag.it) or [Framabag](https://framabag.org). +Alternatively, you can directly sign up for [wallabag.it](https://wallabag.it). This android application allows you to put a link in your wallabag instance, letting you read your wallabag links offline. @@ -36,7 +36,7 @@ wallabag is a creation from Nicolas Lœuillet released under the MIT License (Ex ## Features The android app lets you: -- Connect to your self-hosted wallabag instance or connect to your [wallabag.it](https://wallabag.it) or [Framabag](https://framabag.org) account. +- Connect to your self-hosted wallabag instance or connect to your [wallabag.it](https://wallabag.it) account. - Supports wallabag 2.0 and higher. - Completely ad-free. - Increase and decrease the size of the font and also switch between a serif or sans-serif font for a more comfortable reading experience. diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/network/WallabagWebService.java b/app/src/main/java/fr/gaulupeau/apps/Poche/network/WallabagWebService.java index a9ba6b47..944fde1e 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/network/WallabagWebService.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/network/WallabagWebService.java @@ -27,10 +27,8 @@ public class WallabagWebService { private static final String TAG = WallabagWebService.class.getSimpleName(); private static final Pattern WALLABAG_LOGIN_FORM_V2 = compile("/login_check\"? method=\"?post\"? name=\"?loginform\"?>"); - private static final Pattern FRAMABAG_LOGIN_FORM = compile("/login_check\" class=\"form\" method=\"post\" name=\"loginform\">"); private static final Pattern WALLABAG_LOGOUT_LINK_V2 = compile("/logout\"?>"); private static final Pattern WALLABAG_LOGO_V2 = compile("alt=\"wallabag logo\" ?/?>"); - private static final Pattern FRAMABAG_MARKER = compile("Frama"); private static final Pattern WALLABAG_LOGIN_FORM_V1 = compile("
"); private static final String CLIENT_NAME = "Android app"; @@ -276,8 +274,7 @@ public class WallabagWebService { } public static boolean isLoginPage(String body) { - return (containsMarker(body, WALLABAG_LOGIN_FORM_V2) && containsMarker(body, WALLABAG_LOGO_V2)) - || (containsMarker(body, FRAMABAG_LOGIN_FORM) && containsMarker(body, FRAMABAG_MARKER)); + return containsMarker(body, WALLABAG_LOGIN_FORM_V2) && containsMarker(body, WALLABAG_LOGO_V2); } private boolean isRegularPage(String body) throws IOException { diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConnectionWizardActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConnectionWizardActivity.java index c97f91fa..b89c90bf 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConnectionWizardActivity.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConnectionWizardActivity.java @@ -52,14 +52,12 @@ public class ConnectionWizardActivity extends BaseActionBarActivity { private static final int PROVIDER_NO = -1; private static final int PROVIDER_WALLABAG_IT = 0; - private static final int PROVIDER_FRAMABAG = 1; private static final String PAGE_NONE = ""; private static final String PAGE_WELCOME = "welcome"; private static final String PAGE_PROVIDER_SELECTION = "provider_selection"; private static final String PAGE_CONFIG_GENERIC = "config_generic"; private static final String PAGE_CONFIG_WALLABAG_IT = "config_wallabag_it"; - private static final String PAGE_CONFIG_FRAMABAG = "config_framabag"; private static final String PAGE_SUMMARY = "summary"; public static void runWizard(Context context, boolean skipWelcome) { @@ -127,10 +125,6 @@ public class ConnectionWizardActivity extends BaseActionBarActivity { || ("https://" + WallabagItConfigFragment.WALLABAG_IT_HOSTNAME).equals(url)) { bundle.putInt(DATA_PROVIDER, PROVIDER_WALLABAG_IT); filledOutSomething = true; - } else if(FramabagConfigFragment.FRAMABAG_HOSTNAME.equals(url) - || ("https://" + FramabagConfigFragment.FRAMABAG_HOSTNAME).equals(url)) { - bundle.putInt(DATA_PROVIDER, PROVIDER_FRAMABAG); - filledOutSomething = true; } else if(!TextUtils.isEmpty(url) && !"https://".equals(url)) { bundle.putString(DATA_URL, url); filledOutSomething = true; @@ -277,10 +271,6 @@ public class ConnectionWizardActivity extends BaseActionBarActivity { goToFragment = new WallabagItConfigFragment(); break; - case PROVIDER_FRAMABAG: - goToFragment = new FramabagConfigFragment(); - break; - default: goToFragment = new GenericConfigFragment(); break; @@ -289,7 +279,6 @@ public class ConnectionWizardActivity extends BaseActionBarActivity { case PAGE_CONFIG_GENERIC: case PAGE_CONFIG_WALLABAG_IT: - case PAGE_CONFIG_FRAMABAG: goToFragment = new SummaryFragment(); break; @@ -432,10 +421,6 @@ public class ConnectionWizardActivity extends BaseActionBarActivity { provider = PROVIDER_WALLABAG_IT; break; - case R.id.providerFramabag: - provider = PROVIDER_FRAMABAG; - break; - default: provider = PROVIDER_NO; break; @@ -600,29 +585,6 @@ public class ConnectionWizardActivity extends BaseActionBarActivity { } - public static class FramabagConfigFragment extends GenericConfigFragment { - - public String getPageName() { - return PAGE_CONFIG_FRAMABAG; - } - - static final String FRAMABAG_HOSTNAME = "framabag.org"; - - @Override - protected int getLayoutResourceID() { - return R.layout.connection_wizard_framabag_config_fragment; - } - - @Override - protected void gatherData() { - super.gatherData(); - - url = "https://" + FRAMABAG_HOSTNAME; - tryPossibleURLs = false; - } - - } - public static class SummaryFragment extends WizardPageFragment { @Override diff --git a/app/src/main/res/layout/connection_wizard_framabag_config_fragment.xml b/app/src/main/res/layout/connection_wizard_framabag_config_fragment.xml deleted file mode 100644 index 0e823a78..00000000 --- a/app/src/main/res/layout/connection_wizard_framabag_config_fragment.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -