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

Don't show success fragment for RSS file import

Browse Source
This commit is contained in:
Torsten Grote
2023-01-31 09:54:35 -03:00
parent a888c5f632
commit 8a088638db
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedActivity.java
View File

@@ -11,7 +11,6 @@ import org.briarproject.briar.android.blog.RssImportResult.UrlImportError;
import org.briarproject.briar.android.blog.RssImportResult.UrlImportSuccess; import org.briarproject.briar.android.blog.RssImportResult.UrlImportSuccess;
import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
import org.briarproject.briar.android.fragment.ErrorFragment; import org.briarproject.briar.android.fragment.ErrorFragment;
import org.briarproject.briar.android.fragment.FinalFragment;
import org.briarproject.nullsafety.MethodsNotNullByDefault; import org.briarproject.nullsafety.MethodsNotNullByDefault;
import org.briarproject.nullsafety.ParametersNotNullByDefault; import org.briarproject.nullsafety.ParametersNotNullByDefault;
@@ -70,14 +69,6 @@ public class RssFeedActivity extends BriarActivity
// pop stack back to before the initial import fragment // pop stack back to before the initial import fragment
fm.popBackStackImmediate(RssFeedImportFragment.TAG, fm.popBackStackImmediate(RssFeedImportFragment.TAG,
POP_BACK_STACK_INCLUSIVE); POP_BACK_STACK_INCLUSIVE);
// show success fragment
Fragment f = FinalFragment.newInstance(
R.string.blogs_rss_feeds_import_success,
R.drawable.ic_check_circle_outline,
R.color.briar_brand_green, 0
);
String tag = FinalFragment.TAG;
showFragment(fm, f, tag);
} else if (result instanceof FileImportError) { } else if (result instanceof FileImportError) {
// pop stack back to initial import fragment // pop stack back to initial import fragment
fm.popBackStackImmediate(RssFeedImportFragment.TAG, 0); fm.popBackStackImmediate(RssFeedImportFragment.TAG, 0);

1
briar-android/src/main/res/values/strings.xml
View File

@@ -520,7 +520,6 @@
<string name="blogs_rss_feeds_import_button">Import</string> <string name="blogs_rss_feeds_import_button">Import</string>
<string name="blogs_rss_feeds_import_hint">Enter the URL of the RSS feed</string> <string name="blogs_rss_feeds_import_hint">Enter the URL of the RSS feed</string>
<string name="blogs_rss_feeds_import_progress">Importing RSS Feed…</string> <string name="blogs_rss_feeds_import_progress">Importing RSS Feed…</string>
<string name="blogs_rss_feeds_import_success">Your feed was successfully imported.</string>
<string name="blogs_rss_feeds_import_error">We are sorry! There was an error importing your feed.</string> <string name="blogs_rss_feeds_import_error">We are sorry! There was an error importing your feed.</string>
<string name="blogs_rss_feeds_import_title">Import feed from file</string> <string name="blogs_rss_feeds_import_title">Import feed from file</string>
<string name="blogs_rss_feeds">RSS Feeds</string> <string name="blogs_rss_feeds">RSS Feeds</string>