Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '957-rss-url-case-sensitivity' into 'master'

Browse Source 
Handle RSS URLs case-insensitively

Closes #957

See merge request !544
This commit is contained in:
akwizgran
2017-07-03 16:22:52 +00:00
parent 09e2a15a73 41e5928cca
commit ecf7cf14ae
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportActivity.java
View File

@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.Patterns;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@@ -20,9 +21,12 @@ import org.briarproject.briar.android.activity.BriarActivity;
import org.briarproject.briar.api.feed.FeedManager; import org.briarproject.briar.api.feed.FeedManager;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import static android.view.View.GONE; import static android.view.View.GONE;
@@ -98,10 +102,17 @@ public class RssFeedImportActivity extends BriarActivity {
private void enableOrDisableImportButton() { private void enableOrDisableImportButton() {
String url = urlInput.getText().toString(); String url = urlInput.getText().toString();
if (url.startsWith("http://") || url.startsWith("https://")) importButton.setEnabled(validateAndNormaliseUrl(url) != null);
importButton.setEnabled(true); }
else
importButton.setEnabled(false); @Nullable
private String validateAndNormaliseUrl(String url) {
if (!Patterns.WEB_URL.matcher(url).matches()) return null;
try {
return new URL(url).toString();
} catch (MalformedURLException e) {
return null;
}
} }
private void publish() { private void publish() {
@@ -109,7 +120,9 @@ public class RssFeedImportActivity extends BriarActivity {
importButton.setVisibility(GONE); importButton.setVisibility(GONE);
progressBar.setVisibility(VISIBLE); progressBar.setVisibility(VISIBLE);
importFeed(urlInput.getText().toString()); String url = validateAndNormaliseUrl(urlInput.getText().toString());
if (url == null) throw new AssertionError();
importFeed(url);
} }
private void importFeed(final String url) { private void importFeed(final String url) {

2
briar-android/src/main/res/layout/activity_rss_feed_import.xml
View File

@@ -15,7 +15,7 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="top" android:gravity="top"
android:hint="@string/blogs_rss_feeds_import_hint" android:hint="@string/blogs_rss_feeds_import_hint"
android:inputType="textMultiLine|textUri"/> android:inputType="textUri"/>
<Button <Button
android:id="@+id/importButton" android:id="@+id/importButton"