Merge branch 'master' of https://github.com/nextcloud/news-android

56 files changed, 394 insertions, 193 deletions

diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle
index 04c28b9a..dc38772f 100644
--- a/News-Android-App/build.gradle
+++ b/News-Android-App/build.gradle
@@ -70,10 +70,6 @@ android {
         oss {
             dimension "default"
         }
-        // 99% Open-source edition:  uses the YouTube Player Jar
-        extra {
-            dimension "default"
-        }
         // Used for continous integration, e.g. to test built .apk-files from pull requests
         dev {
             dimension "default"
@@ -127,11 +123,10 @@ repositories {
     maven { url  "https://dl.bintray.com/lukaville/maven" } //Needed for com.nbsp:library:1.8 in Material File Picker
 }
 
-final DAGGER_VERSION = '2.27'
-final BUTTERKNIFE_VERSION = '10.2.1'
+final DAGGER_VERSION = '2.33'
 final ESPRESSO_VERSION = '3.3.0'
-final OKHTTP_VERSION = '3.12.10'
-final MOCKITO_VERSION = '3.6.28'
+final OKHTTP_VERSION = '3.12.13'
+final MOCKITO_VERSION = '3.8.0'
 final RETROFIT_VERSION = '2.6.4'
 
 dependencies {
@@ -142,15 +137,15 @@ dependencies {
     // implementation 'com.google.android.gms:play-services:4.2.42'
     // implementation project(':Android-SingleSignOn')
     // implementation project(path: ':MaterialShowcaseView:library', configuration: 'default')
-    implementation 'com.github.nextcloud:Android-SingleSignOn:0.5.5'
-
+    implementation 'com.github.nextcloud:Android-SingleSignOn:0.5.6'
+    
     implementation "androidx.core:core:1.3.2"
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.preference:preference:1.1.1"
 
     // https://mvnrepository.com/artifact/com.google.android.material/material
-    implementation "com.google.android.material:material:1.3.0-rc01"
+    implementation "com.google.android.material:material:1.3.0"
     //implementation "com.google.android.material:material:1.0.0"
     implementation "androidx.palette:palette:1.0.0"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
@@ -163,7 +158,7 @@ dependencies {
 
     implementation 'com.sothree.slidinguppanel:library:3.2.1'
 
-    implementation 'org.greenrobot:eventbus:3.1.1'
+    implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'de.greenrobot:greendao:2.0.0'
     implementation ('de.greenrobot:greendao-generator:2.0.0') {
         exclude group: 'org.freemarker'
@@ -183,7 +178,7 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.20'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
     implementation "com.squareup.retrofit2:adapter-rxjava2:$RETROFIT_VERSION"
 
     implementation "com.squareup.retrofit2:retrofit:$RETROFIT_VERSION"
@@ -194,12 +189,9 @@ dependencies {
     implementation 'com.nbsp:library:1.8' // MaterialFilePicker
 
     implementation 'androidx.multidex:multidex:2.0.1'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
-
-    //extraImplementation 'com.github.tommus:youtube-android-player-api:1.2.2'
-
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation("org.mockito:mockito-core:$MOCKITO_VERSION") {
         exclude group: 'org.hamcrest'
     }
@@ -222,7 +214,7 @@ dependencies {
     //androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
     //androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
 
-    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'org.robolectric:robolectric:4.5.1'
 
     // Core library
     androidTestImplementation 'androidx.test:core:1.3.0'
@@ -234,7 +226,7 @@ dependencies {
     // Assertions
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.ext:truth:1.3.0'
-    androidTestImplementation 'com.google.truth:truth:1.0.1'
+    androidTestImplementation 'com.google.truth:truth:1.1.2'
 
     // Espresso dependencies
     androidTestImplementation "androidx.test.espresso:espresso-core:$ESPRESSO_VERSION"
diff --git a/News-Android-App/proguard-rules.pro b/News-Android-App/proguard-rules.pro
index d0bffe07..dea30656 100644
--- a/News-Android-App/proguard-rules.pro
+++ b/News-Android-App/proguard-rules.pro
@@ -48,21 +48,6 @@
 
 
 
-# Butterknife
--keep class butterknife.** { *; }
--dontwarn butterknife.internal.**
--keep class **$$ViewBinder { *; }
-
--keepclasseswithmembernames class * {
-    @butterknife.* <fields>;
-}
-
--keepclasseswithmembernames class * {
-    @butterknife.* <methods>;
-}
-
-
-
 # okhttp
 -dontwarn okio.**
 -dontwarn javax.annotation.Nullable
diff --git a/News-Android-App/src/androidTest/java/de/luhmer/owncloudnewsreader/tests/NewsReaderListActivityUiTests.java b/News-Android-App/src/androidTest/java/de/luhmer/owncloudnewsreader/tests/NewsReaderListActivityUiTests.java
index f1e87a8b..7fe48628 100644
--- a/News-Android-App/src/androidTest/java/de/luhmer/owncloudnewsreader/tests/NewsReaderListActivityUiTests.java
+++ b/News-Android-App/src/androidTest/java/de/luhmer/owncloudnewsreader/tests/NewsReaderListActivityUiTests.java
@@ -42,7 +42,7 @@ import de.luhmer.owncloudnewsreader.NewsReaderListActivity;
 import de.luhmer.owncloudnewsreader.R;
 import de.luhmer.owncloudnewsreader.TestApplication;
 import de.luhmer.owncloudnewsreader.adapter.NewsListRecyclerAdapter;
-import de.luhmer.owncloudnewsreader.adapter.ViewHolder;
+import de.luhmer.owncloudnewsreader.adapter.RssItemViewHolder;
 import de.luhmer.owncloudnewsreader.di.ApiProvider;
 import de.luhmer.owncloudnewsreader.di.TestApiProvider;
 import de.luhmer.owncloudnewsreader.di.TestComponent;
@@ -150,7 +150,7 @@ public class NewsReaderListActivityUiTests {
         assertNotNull(ndf);
         final NewsListRecyclerAdapter na = (NewsListRecyclerAdapter) ndf.getRecyclerView().getAdapter();
         assertNotNull(na);
-        final ViewHolder vh = (ViewHolder) ndf.getRecyclerView().getChildViewHolder(ndf.getRecyclerView().getLayoutManager().findViewByPosition(scrollPosition));
+        final RssItemViewHolder vh = (RssItemViewHolder) ndf.getRecyclerView().getChildViewHolder(ndf.getRecyclerView().getLayoutManager().findViewByPosition(scrollPosition));
         assertNotNull(vh);
         LinearLayoutManager llm = (LinearLayoutManager) ndf.getRecyclerView().getLayoutManager();
 
diff --git a/News-Android-App/src/androidTest/java/screengrab/ScreenshotTest.java b/News-Android-App/src/androidTest/java/screengrab/ScreenshotTest.java
index 9066e80c..69eb77ba 100644
--- a/News-Android-App/src/androidTest/java/screengrab/ScreenshotTest.java
+++ b/News-Android-App/src/androidTest/java/screengrab/ScreenshotTest.java
@@ -16,7 +16,7 @@ import de.luhmer.owncloudnewsreader.NewsReaderDetailFragment;
 import de.luhmer.owncloudnewsreader.NewsReaderListActivity;
 import de.luhmer.owncloudnewsreader.NewsReaderListFragment;
 import de.luhmer.owncloudnewsreader.adapter.NewsListRecyclerAdapter;
-import de.luhmer.owncloudnewsreader.adapter.ViewHolder;
+import de.luhmer.owncloudnewsreader.adapter.RssItemViewHolder;
 import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
 import de.luhmer.owncloudnewsreader.model.PodcastItem;
 import tools.fastlane.screengrab.Screengrab;
@@ -106,7 +106,7 @@ public class ScreenshotTest {
 
         mActivity.runOnUiThread(() -> {
             NewsListRecyclerAdapter na = (NewsListRecyclerAdapter) nrdf.getRecyclerView().getAdapter();
-            ViewHolder vh = (ViewHolder) nrdf.getRecyclerView().getChildViewHolder(nrdf.getRecyclerView().getLayoutManager().findViewByPosition(itemPos));
+            RssItemViewHolder vh = (RssItemViewHolder) nrdf.getRecyclerView().getChildViewHolder(nrdf.getRecyclerView().getLayoutManager().findViewByPosition(itemPos));
             na.changeReadStateOfItem(vh, false);
         });
     }
@@ -132,7 +132,7 @@ public class ScreenshotTest {
         //Screengrab.screenshot("podcast_list");
 
         mActivity.runOnUiThread(() -> {
-            ViewHolder vh = (ViewHolder) nrdf.getRecyclerView().getChildViewHolder(nrdf.getRecyclerView().getLayoutManager().findViewByPosition(0));
+            RssItemViewHolder vh = (RssItemViewHolder) nrdf.getRecyclerView().getChildViewHolder(nrdf.getRecyclerView().getLayoutManager().findViewByPosition(0));
             PodcastItem podcastItem = DatabaseConnectionOrm.ParsePodcastItemFromRssItem(mActivity, vh.getRssItem());
             mActivity.openMediaItem(podcastItem);
         });
@@ -177,7 +177,7 @@ public class ScreenshotTest {
         }
 
         mActivity.runOnUiThread(() -> {
-            ViewHolder vh = (ViewHolder) nrdf.getRecyclerView().getChildViewHolder(nrdf.getRecyclerView().getLayoutManager().findViewByPosition(1));
+            RssItemViewHolder vh = (RssItemViewHolder) nrdf.getRecyclerView().getChildViewHolder(nrdf.getRecyclerView().getLayoutManager().findViewByPosition(1));
             PodcastItem podcastItem = DatabaseConnectionOrm.ParsePodcastItemFromRssItem(mActivity, vh.getRssItem());
             mActivity.openMediaItem(podcastItem);
         });
@@ -207,14 +207,14 @@ public class ScreenshotTest {
     }
 
     private void openDrawer() {
-        if(mActivity.drawerLayout != null) {
-            mActivity.drawerLayout.openDrawer(GravityCompat.START, true);
+        if(mActivity.binding.drawerLayout != null) {
+            mActivity.binding.drawerLayout.openDrawer(GravityCompat.START, true);
         }
     }
 
     private void closeDrawer() {
-        if(mActivity.drawerLayout != null) {
-            mActivity.drawerLayout.closeDrawer(GravityCompat.START, true);
+        if(mActivity.binding.drawerLayout != null) {
+            mActivity.binding.drawerLayout.closeDrawer(GravityCompat.START, true);
         }
     }
 }
diff --git a/News-Android-App/src/dev/res/values/strings.xml b/News-Android-App/src/dev/res/values/strings.xml
new file mode 100644
index 00000000..fb18ba4f
--- /dev/null
+++ b/News-Android-App/src/dev/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">News Dev</string>
+    <string name="account_type" translatable="false">de.luhmer.owncloudnewsreader.dev</string>
+    <string name="authority" translatable="false">de.luhmer.owncloudnewsreader.dev</string>
+</resources>
diff --git a/News-Android-App/src/main/AndroidManifest.xml b/News-Android-App/src/main/AndroidManifest.xml
index 003d2fd8..c993ff4a 100644
--- a/News-Android-App/src/main/AndroidManifest.xml
+++ b/News-Android-App/src/main/AndroidManifest.xml
@@ -162,7 +162,7 @@
 
         <provider
             android:name=".providers.OwnCloudSyncProvider"
-            android:authorities="de.luhmer.owncloudnewsreader"
+            android:authorities="@string/authority"
             android:label="@string/auto_sync_string"
             android:syncable="true" />
         <provider
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
index cbe00113..c7a5ab95 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
@@ -97,14 +97,6 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 	SharedPreferences mPrefs;
 
 	private boolean mShowFastActions;
-	
-	public static SORT_DIRECTION getSortDirectionFromSettings(SharedPreferences prefs) {
-		SORT_DIRECTION sDirection = SORT_DIRECTION.asc;
-		String sortDirection = prefs.getString(SettingsActivity.SP_SORT_ORDER, "1");
-		if ("1".equals(sortDirection))
-			sDirection = SORT_DIRECTION.desc;
-		return sDirection;
-	}
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailImageDialogFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailImageDialogFragment.java
index f7f00059..36c61463 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailImageDialogFragment.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailImageDialogFragment.java
@@ -447,7 +447,7 @@ public class NewsDetailImageDialogFragment extends DialogFragment {
 
                             //String imagePath = downloadManager.getUriForDownloadedFile(refID).toString();
 
-                            String downloadFileLocalUri = cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI));
+                            String downloadFileLocalUri = cursor.getString(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_LOCAL_URI));
                             File image = new File(Uri.parse(downloadFileLocalUri).getPath());
 
                             NextcloudNotificationManager.showNotificationDownloadSingleImageComplete(context, image);
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
index 1caa0066..573eb86b 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
@@ -117,6 +117,7 @@ import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;
 
 import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+import static androidx.annotation.VisibleForTesting.PROTECTED;
 import static de.luhmer.owncloudnewsreader.LoginDialogActivity.RESULT_LOGIN;
 import static de.luhmer.owncloudnewsreader.LoginDialogActivity.ShowAlertDialog;
 
@@ -141,9 +142,10 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
 
     public static HashSet<Long> stayUnreadItems = new HashSet<>();
 
-	private static MenuItem menuItemDownloadMoreItems;
+	private MenuItem menuItemDownloadMoreItems;
 
-	protected ActivityNewsreaderBinding binding;
+	@VisibleForTesting(otherwise = PROTECTED)
+	public ActivityNewsreaderBinding binding;
 
 	//private ServiceConnection mConnection = null;
 
@@ -383,8 +385,9 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
 
 		boolean isAccountThere = false;
 		Account[] accounts = mAccountManager.getAccounts();
+		String accountType = AccountGeneral.getAccountType(this);
 		for (Account account : accounts) {
-			if (account.type.intern().equals(AccountGeneral.ACCOUNT_TYPE)) {
+			if (account.type.intern().equals(accountType)) {
 				isAccountThere = true;
 			}
 		}
@@ -392,7 +395,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
 		//If the account is not in the Android Account Manager
 		if (!isAccountThere) {
 			//Then add the new account
-			Account account = new Account(getString(R.string.app_name), AccountGeneral.ACCOUNT_TYPE);
+			Account account = new Account(getString(R.string.app_name), accountType);
 			mAccountManager.addAccountExplicitly(account, "", new Bundle());
 
 			SyncIntervalSelectorActivity.setAccountSyncInterval(this, mPrefs);
@@ -652,8 +655,9 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
 				AccountManager mAccountManager = AccountManager.get(this);
 				Account[] accounts = mAccountManager.getAccounts();
 				for(Account acc : accounts) {
-                    if (acc.type.equals(AccountGeneral.ACCOUNT_TYPE)) {
-                        ContentResolver.requestSync(acc, AccountGeneral.ACCOUNT_TYPE, accBundle);
+					String accountType = AccountGeneral.getAccountType(this);
+					if (acc.type.equals(accountType)) {
+                        ContentResolver.requestSync(acc, accountType, accBundle);
                     }
                 }
 				//http://stackoverflow.com/questions/5253858/why-does-contentresolver-requestsync-not-trigger-a-sync
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java
index 53bffb53..59cf2b37 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java
@@ -72,21 +72,22 @@ public class SyncIntervalSelectorActivity extends AppCompatActivity {
         int minutes = mPrefs.getInt(SYNC_INTERVAL_IN_MINUTES_STRING, SYNC_DEFAULT_INTERVAL);
 
         AccountManager mAccountManager = AccountManager.get(context);
-        Account[] accounts = mAccountManager.getAccountsByType(AccountGeneral.ACCOUNT_TYPE);
+        String accountType = AccountGeneral.getAccountType(context);
+        Account[] accounts = mAccountManager.getAccountsByType(accountType);
         for (Account account : accounts) {
             if (minutes != 0) {
                 long SYNC_INTERVAL = minutes * SECONDS_PER_MINUTE;
-                ContentResolver.setSyncAutomatically(account, AccountGeneral.ACCOUNT_TYPE, true);
+                ContentResolver.setSyncAutomatically(account, accountType, true);
 
                 Bundle bundle = new Bundle();
                 ContentResolver.addPeriodicSync(
                         account,
-                        AccountGeneral.ACCOUNT_TYPE,
+                        accountType,
                         bundle,
                         SYNC_INTERVAL);
 
             } else {
-                ContentResolver.setSyncAutomatically(account, AccountGeneral.ACCOUNT_TYPE, false);
+                ContentResolver.setSyncAutomatically(account, accountType, false);
             }
         }
     }
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/NewsListRecyclerAdapter.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/NewsListRecyclerAdapter.java
index 10525cd4..d0e9936b 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/NewsListRecyclerAdapter.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/NewsListRecyclerAdapter.java
@@ -37,7 +37,7 @@ import de.luhmer.owncloudnewsreader.helper.StopWatch;
 import de.luhmer.owncloudnewsreader.interfaces.IPlayPausePodcastClicked;
 import de.luhmer.owncloudnewsreader.model.CurrentRssViewDataHolder;
 
-public class NewsListRecyclerAdapter extends RecyclerView.Adapter {
+public class NewsListRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private static final String TAG = "NewsListRecyclerAdapter";
 
     private final int VIEW_ITEM = 1; // Item
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/AccountGeneral.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/AccountGeneral.java
index 81b3902a..f8d2734d 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/AccountGeneral.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/AccountGeneral.java
@@ -1,10 +1,10 @@
 package de.luhmer.owncloudnewsreader.authentication;
 
+import android.content.Context;
+
+import de.luhmer.owncloudnewsreader.R;
+
 public class AccountGeneral {
-	/**
-	 * Account type id
-	 */
-	public static final String ACCOUNT_TYPE = "de.luhmer.owncloudnewsreader";
 
 	/**
 	 * Account name
@@ -21,4 +21,10 @@ public class AccountGeneral {
 	public static final String AUTHTOKEN_TYPE_FULL_ACCESS = "Full access";
 	public static final String AUTHTOKEN_TYPE_FULL_ACCESS_LABEL = "Full access to an Nextcloud News account";
 
+	/**
+	 * Account type id
+	 */
+	public static String getAccountType(Context context) {
+		return context.getString(R.string.account_type);
+	}
 }
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/OwnCloudSyncAdapter.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/OwnCloudSyncAdapter.java
index 0ad3dde7..90e42a69 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/OwnCloudSyncAdapter.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/OwnCloudSyncAdapter.java
@@ -60,7 +60,7 @@ public class OwnCloudSyncAdapter extends AbstractThreadedSyncAdapter {
     public OwnCloudSyncAdapter(Context context, boolean autoInitialize) {
         super(context, autoInitialize);
 
-        ((NewsReaderApplication) context.getApplicationContext()).getAppComponent().injectService(this);
+        ((NewsReaderApplication) context).getAppComponent().injectService(this);
     }
 
 
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadImagesService.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadImagesService.java
index fdc51be1..c6aec03c 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadImagesService.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadImagesService.java
@@ -114,10 +114,10 @@ public class DownloadImagesService extends JobIntentService {
 
         if(downloadMode.equals(DownloadMode.FAVICONS_ONLY)) {
             List<Feed> feedList = dbConn.getListOfFeeds();
-            FavIconHandler favIconHandler = new FavIconHandler(this);
+            FavIconHandler favIconHandler = new FavIconHandler(getApplicationContext());
             for(Feed feed : feedList) {
                 try {
-                    favIconHandler.preCacheFavIcon(feed, this);
+                    favIconHandler.preCacheFavIcon(feed, getApplicationContext());
                 } catch(IllegalStateException ex) {
                     Log.e(TAG, ex.getMessage());
                 }
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/OwnCloudSyncService.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/OwnCloudSyncService.java
index 8792c3f3..15693a0d 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/OwnCloudSyncService.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/OwnCloudSyncService.java
@@ -24,7 +24,7 @@ public class OwnCloudSyncService extends Service {
         */
         synchronized (sSyncAdapterLock) {
             if (sSyncAdapter == null) {
-                sSyncAdapter = new OwnCloudSyncAdapter(this, true);
+                sSyncAdapter = new OwnCloudSyncAdapter(getApplicationContext(), true);
             }
         }
     }
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetNewsViewsFactory.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetNewsViewsFactory.java
index 0c7ef79d..6c7a1218 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetNewsViewsFactory.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetNewsViewsFactory.java
@@ -35,8 +35,8 @@ import android.widget.RemoteViewsService;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 
+import de.greenrobot.dao.query.LazyList;
 import de.luhmer.owncloudnewsreader.Constants;
 import de.luhmer.owncloudnewsreader.R;
 import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
@@ -47,7 +47,7 @@ public class WidgetNewsViewsFactory implements RemoteViewsService.RemoteViewsFac
 	private static final String TAG = WidgetNewsViewsFactory.class.getCanonicalName();
 
     private DatabaseConnectionOrm dbConn;
-    private List<RssItem> rssItems;
+    private LazyList<RssItem> rssItems;
 	private Context context;
 
 	private int appWidgetId;
@@ -70,6 +70,7 @@ public class WidgetNewsViewsFactory implements RemoteViewsService.RemoteViewsFac
 
 	@Override
 	public void onDestroy() {
+	    rssItems.close();
 	}
 
 	@Override
@@ -186,11 +187,13 @@ public class WidgetNewsViewsFactory implements RemoteViewsService.RemoteViewsFac
 		return(true);
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
 	public void onDataSetChanged() {
         Log.v(TAG, "DataSetChanged - WidgetID: " + appWidgetId);
 
+        if (rssItems != null && !rssItems.isClosed()) {
+            rssItems.close();
+        }
         rssItems = dbConn.getAllUnreadRssItemsForWidget();
 
         Log.v(TAG, "DataSetChanged finished!");
diff --git a/News-Android-App/src/main/res/layout/subscription_detail_list_item_card_view.xml b/News-Android-App/src/main/res/layout/subscription_detail_list_item_card_view.xml
index 3bc036ce..fa9815d2 100644
--- a/News-Android-App/src/main/res/layout/subscription_detail_list_item_card_view.xml
+++ b/News-Android-App/src/main/res/layout/subscription_detail_list_item_card_view.xml
@@ -23,7 +23,7 @@
             android:background="?attr/dividerLineColor"
             />
 
-        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <RelativeLayout
             android:layout_marginStart="@dimen/listview_row_margin_left"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -126,7 +126,7 @@
                 app:tint="?attr/starredColor"
                 android:layout_alignParentEnd="true"
                 android:paddingEnd="@dimen/listview_row_margin_left"
-                android:contentDescription="@string/content_desc_add_to_favorites"/>
+                android:contentDescription="@string/content_desc_add_to_favorites" />
 
             <include
                 layout="@layout/subscription_detail_list_item_podcast_wrapper"
diff --git a/News-Android-App/src/main/res/values-ca/strings.xml b/News-Android-App/src/main/res/values-ca/strings.xml
index 42783b93..a82b9895 100644
--- a/News-Android-App/src/main/res/values-ca/strings.xml
+++ b/News-Android-App/src/main/res/values-ca/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Activa les funcions d\'accés ràpid</string>
     <string name="pref_title_OpenInBrowserDirectly">Omet la vista detallada i obre l\'article dins del navegador</string>
 
-    <string name="dialog_feature_not_available">Aquesta funcionalitat no és disponible en aquesta versió de l\'aplicació (de codi font obert). Si voleu fer servir aquesta funcionalitat, si us plau descarregueu-vos l\'Aplicació del repositori GitHub o del Google Play Store</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Accepta certificats de desconeguts?</string>
     <string name="mtm_decision_always">Sempre</string>
diff --git a/News-Android-App/src/main/res/values-cs-rCZ/strings.xml b/News-Android-App/src/main/res/values-cs-rCZ/strings.xml
index a9f98730..beec3f83 100644
--- a/News-Android-App/src/main/res/values-cs-rCZ/strings.xml
+++ b/News-Android-App/src/main/res/values-cs-rCZ/strings.xml
@@ -157,9 +157,6 @@
     <string name="pref_title_ShowFastActions">Aktivovat funkce pro rychlý přístup</string>
     <string name="pref_title_OpenInBrowserDirectly">Přeskočit podrobné zobrazení a otevřít článek v prohlížeči</string>
 
-    <string name="dialog_feature_not_available">Tato funkce není k dispozici v této (open source) variantě aplikace. Pokud chcete tuto funkci používat, stáhněte si aplikaci z GitHub repozitáře nebo z Google Play Store.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Přijmout neznámý certifikát?</string>
     <string name="mtm_decision_always">Vždy</string>
diff --git a/News-Android-App/src/main/res/values-da/strings.xml b/News-Android-App/src/main/res/values-da/strings.xml
index f9f2dbec..b4cb2641 100644
--- a/News-Android-App/src/main/res/values-da/strings.xml
+++ b/News-Android-App/src/main/res/values-da/strings.xml
@@ -143,9 +143,6 @@
     <string name="pref_title_MarkAsReadWhileScrolling">Markér som læst når der rulles</string>
     <string name="pref_title_OpenInBrowserDirectly">Spring detaljeret visning over og åbn artikel i browseren</string>
 
-    <string name="dialog_feature_not_available">Denne feature er ikke tilgængelig i denne version (open-source) a denne app. Hvis du ønsker at benytte denne feature, venligt hent app-en fra GitHub Depotet, eller hent app-en fra Google Play Store.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Acceptér ukendt certifikat? </string>
     <string name="mtm_decision_always">Altid</string>
diff --git a/News-Android-App/src/main/res/values-de/strings.xml b/News-Android-App/src/main/res/values-de/strings.xml
index b574420f..d1b6e9c6 100644
--- a/News-Android-App/src/main/res/values-de/strings.xml
+++ b/News-Android-App/src/main/res/values-de/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Schnellzugriffsfunktionen aktivieren</string>
     <string name="pref_title_OpenInBrowserDirectly">Detailansicht überspringen und Artikel in Browser öffnen</string>
 
-    <string name="dialog_feature_not_available">Diese Funktion ist in dieser (Open-Source-)Version dieser App nicht verfügbar. Wenn Sie diese Funktion nutzen möchten, laden Sie bitte die App aus dem GitHub-Repository oder aus dem Google Play Store herunter.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Unbekanntes Zertifikat akzeptieren?</string>
     <string name="mtm_decision_always">Immer</string>
diff --git a/News-Android-App/src/main/res/values-el/strings.xml b/News-Android-App/src/main/res/values-el/strings.xml
index ca45aea9..704a85f6 100644
--- a/News-Android-App/src/main/res/values-el/strings.xml
+++ b/News-Android-App/src/main/res/values-el/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Ενεργοποιήστε τις λειτουργίες γρήγορης πρόσβασης</string>
     <string name="pref_title_OpenInBrowserDirectly">Παράλειψη λεπτομερούς προβολής και άνοιγμα αρχείου στον περιηγητή</string>
 
-    <string name="dialog_feature_not_available">Αυτή η επιλογή δεν είναι διαθέσιμη σε αυτή την (ανοιχτού-λογισμικού) εφαρμογή. Εάν επιθυμείτε αυτή την επιλογή παρακαλώ κάνετε λήψη από το GitHub Repository ή από το Google Play Store.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Αποδοχή Άγνωστων Πιστοποιητικών;</string>
     <string name="mtm_decision_always">Πάντα</string>
diff --git a/News-Android-App/src/main/res/values-en-rGB/strings.xml b/News-Android-App/src/main/res/values-en-rGB/strings.xml
index b98ca2d9..842bd248 100644
--- a/News-Android-App/src/main/res/values-en-rGB/strings.xml
+++ b/News-Android-App/src/main/res/values-en-rGB/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Activate fast access functions</string>
     <string name="pref_title_OpenInBrowserDirectly">Skip detailed view and open article in the browser</string>
 
-    <string name="dialog_feature_not_available">This feature is not available in this (open-source) version of this app. If you want to use this feature please download the app from the GitHub Repository or download the App from the Google Play Store.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Accept Unknown Certificate?</string>
     <string name="mtm_decision_always">Always</string>
diff --git a/News-Android-App/src/main/res/values-es/strings.xml b/News-Android-App/src/main/res/values-es/strings.xml
index 54273cee..7c6bc3eb 100644
--- a/News-Android-App/src/main/res/values-es/strings.xml
+++ b/News-Android-App/src/main/res/values-es/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Activar funciones de acceso rápido</string>
     <string name="pref_title_OpenInBrowserDirectly">Saltarse la vista detallada y abrir el artículo en el navegador</string>
 
-    <string name="dialog_feature_not_available">Esta característica no está disponible en esta versión (de código abierto) de la app. Si quieres usar esta característica, por favor descarga la app desde el repositorio de GitHub o desde Google Play Store.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">¿Aceptar certificado desconocido?</string>
     <string name="mtm_decision_always">Siempre</string>
diff --git a/News-Android-App/src/main/res/values-eu/strings.xml b/News-Android-App/src/main/res/values-eu/strings.xml
index f1106545..f7a5a13a 100644
--- a/News-Android-App/src/main/res/values-eu/strings.xml
+++ b/News-Android-App/src/main/res/values-eu/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Gaitu sarbide azkarreko funtzioak</string>
     <string name="pref_title_OpenInBrowserDirectly">Saltatu ikuspegi xehatua eta ireki artikulua nabigatzailean</string>
 
-    <string name="dialog_feature_not_available">Ezaugarri hau ez dago erabilgarri aplikazio honen (kode irekiko) bertsio honetan. Ezaugarri hau erabili nahi baduzu, deskarga ezazu aplikazioa GitHub biltegitik edo Google Play Store-tik.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Ziurtagiri ezezaguna onartu?</string>
     <string name="mtm_decision_always">Beti</string>
diff --git a/News-Android-App/src/main/res/values-fa/strings.xml b/News-Android-App/src/main/res/values-fa/strings.xml
index 8f2a5aef..3e8e5ae2 100644
--- a/News-Android-App/src/main/res/values-fa/strings.xml
+++ b/News-Android-App/src/main/res/values-fa/strings.xml
@@ -144,9 +144,6 @@
     <string name="pref_title_ShowFastActions">فعال کردن عمل‌کردهای دسترسی سریع</string>
     <string name="pref_title_OpenInBrowserDirectly">پرش از نمای باجزییات و گشودن مقاله در مرورگر</string>
 
-    <string name="dialog_feature_not_available">این ویژگی در این نگارش (آزاد) کاره موجود نیست. اگر می‌خواهید از این ویژگی استفاده کنید، لطفاً کاره را از مخزن گیت‌هاب یا فروشگاه پلی گوگل بارگیری کنید.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">پذیرش گواهی‌نامهٔ ناشناس؟</string>
     <string name="mtm_decision_always">همواره</string>
diff --git a/News-Android-App/src/main/res/values-fi-rFI/strings.xml b/News-Android-App/src/main/res/values-fi-rFI/strings.xml
index ce89a803..d81f68cf 100644
--- a/News-Android-App/src/main/res/values-fi-rFI/strings.xml
+++ b/News-Android-App/src/main/res/values-fi-rFI/strings.xml
@@ -16,7 +16,7 @@
     </plurals>
     <string name="message_bar_reload">Päivitä</string>
     <string name="allUnreadFeeds">Kaikki lukemattomat artikkelit</string>
-    <string name="starredFeeds">Tähdellä merkityt</string>
+    <string name="starredFeeds">Suosikit</string>
     <string name="title_activity_new_feed">Lisää uusi syöte</string>
 
     <string name="menu_update">Päivitä</string>
@@ -30,7 +30,7 @@
     <string name="permission_req_location_twilight_text">Automaattinen teeman vaihto valoisasta tummaan vaatii laitteen sijainnin, jotta auringon nousu- ja laskuaika voidaan määrittää.</string>
 
     <!-- Action Bar Items -->
-    <string name="action_starred">Merkkaa tähdellä</string>
+    <string name="action_starred">Suosikkimerkintä päälle/pois</string>
     <string name="action_read">Merkkaa luetuksi</string>
     <string name="action_playPodacst">Toista podcast</string>
     <string name="action_openInBrowser">Avaa selaimessa</string>
@@ -144,9 +144,6 @@
     <string name="pref_title_ShowFastActions">Ota käyttöön pikatoiminnot</string>
     <string name="pref_title_OpenInBrowserDirectly">Ohita artikkelinäkymä ja avaa se suoraan selaimessa</string>
 
-    <string name="dialog_feature_not_available">Tämä ominaisuus ei ole käytettävissä tässä sovelluksen (avoimen lähdekoodin) versiossa. Jos haluat käyttää ominaisuutta, lataa sovellus GitHubista tai Google Play-kaupasta.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Hyväksytäänkö tuntematon varmenne?</string>
     <string name="mtm_decision_always">Aina</string>
diff --git a/News-Android-App/src/main/res/values-fr/strings.xml b/News-Android-App/src/main/res/values-fr/strings.xml
index 22598be0..19d9cffe 100644
--- a/News-Android-App/src/main/res/values-fr/strings.xml
+++ b/News-Android-App/src/main/res/values-fr/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Activer les fonctions d\'accès rapide</string>
     <string name="pref_title_OpenInBrowserDirectly">Ignorer la vue détaillée et ouvrir dans un navigateur</string>
 
-    <string name="dialog_feature_not_available">Cette fonctionnalité n\'est pas disponible dans cette version (open-source) de cette application. Si vous souhaitez utiliser cette fonctionnalité, veuillez télécharger l\'application depuis le dépôt GitHub ou télécharger l\'application depuis le Google Play Store.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Accepter les certificats non sûrs ?</string>
     <string name="mtm_decision_always">Toujours</string>
diff --git a/News-Android-App/src/main/res/values-gl/strings.xml b/News-Android-App/src/main/res/values-gl/strings.xml
index b9206529..bb607e43 100644
--- a/News-Android-App/src/main/res/values-gl/strings.xml
+++ b/News-Android-App/src/main/res/values-gl/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Activar as funcións de acceso rápido</string>
     <string name="pref_title_OpenInBrowserDirectly">Omitir a vista detallada e abrir o artigo no navegador</string>
 
-    <string name="dialog_feature_not_available">Esta característica non está dispoñíbel nesta versión (de código aberto) da aplicación. Se quere usar esta característica, descargue a aplicación dende o repositorio de GitHub ou dende Google Play Store.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Aceptar un certificado descoñecido?</string>
     <string name="mtm_decision_always">Sempre</string>
diff --git a/News-Android-App/src/main/res/values-he/strings.xml b/News-Android-App/src/main/res/values-he/strings.xml
index 0f83b61b..e3e23752 100644
--- a/News-Android-App/src/main/res/values-he/strings.xml
+++ b/News-Android-App/src/main/res/values-he/strings.xml
@@ -153,9 +153,6 @@
     <string name="pref_title_ShowFastActions">הפעלת תכונות גישה מהירה</string>
     <string name="pref_title_OpenInBrowserDirectly">לדלג על התצוגה המפורטת ולפתוח את הכתבה בדפדפן</string>
 
-    <string name="dialog_feature_not_available">התכונה איזה זמינה בגרסת (קוד פתוח) זו של היישומון. אם תכונה זו חשובה לך נא להוריד את היישומון ממאגר ה־GitHub או מחנות היישומונים Play מבית Google.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">לקבל אישור בלתי ידוע?</string>
     <string name="mtm_decision_always">תמיד</string>
diff --git a/News-Android-App/src/main/res/values-hr/strings.xml b/News-Android-App/src/main/res/values-hr/strings.xml
index a43abcee..f6177db4 100644
--- a/News-Android-App/src/main/res/values-hr/strings.xml
+++ b/News-Android-App/src/main/res/values-hr/strings.xml
@@ -129,6 +129,9 @@
     <string name="pref_header_general">Općenito</string>
     <string name="pref_title_general_sort_order">Redoslijed razvrstavanja</string>
 
+    <string name="pref_general_sort_order_new_old">Novo → staro</string>
+    <string name="pref_general_sort_order_old_new">Staro → novo</string>
+
     <string name="pref_rename_action_swipe_right">Radnja pri pomicanju udesno</string>
     <string name="pref_rename_action_swipe_left">Radnja pri pomicanju ulijevo</string>
 
@@ -149,9 +152,6 @@
     <string name="pref_title_ShowFastActions">Aktiviraj funkcije brzog pristupa</string>
     <string name="pref_title_OpenInBrowserDirectly">Preskoči detaljan prikaz i otvori članak u pregledniku</string>
 
-    <string name="dialog_feature_not_available">Ova značajka nije dostupna u ovoj inačici aplikacije (otvorenog koda). Ako se želite koristiti ovom značajkom, preuzmite aplikaciju iz repozitorija GitHub ili preuzmite aplikaciju iz trgovine Google Play.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Prihvati nepoznatu vjerodajnicu?</string>
     <string name="mtm_decision_always">Uvijek</string>
@@ -174,6 +174,8 @@
     <string name="pref_report_issue_summary">Zahtijeva (besplatan) GitHub račun</string>
     <string name="pref_contribute">Doprinosite!</string>
     <string name="pref_contribute_summary">Nabavi izvorni kod</string>
+    <string name="pref_privacy">Privatnost</string>
+    <string name="pref_privacy_summary">Pravila o privatnosti za Android Nextcloud News</string>
     <string name="pref_version">Aplikacija za Android Nextcloud News</string>
 
 
diff --git a/News-Android-App/src/main/res/values-hu-rHU/strings.xml b/News-Android-App/src/main/res/values-hu-rHU/strings.xml
index de40646e..962f7aa4 100644
--- a/News-Android-App/src/main/res/values-hu-rHU/strings.xml
+++ b/News-Android-App/src/main/res/values-hu-rHU/strings.xml
@@ -144,9 +144,6 @@
     <string name="pref_title_ShowFastActions">Gyors elérési funkciók aktiválása</string>
     <string name="pref_title_OpenInBrowserDirectly">Részletes nézet megjelenítésének átugrása és megnyitás böngészőben</string>
 
-    <string name="dialog_feature_not_available">Ez a funkció az alkalmazás ezen (nyílt forráskódú) verziójában nem érhető el. Ha használni akarja ezt a funkciót, akkor töltse le az alkalmazást a GitHub tárolóból vagy a Google Play Áruházból.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Elfogadja az ismeretlen tanúsítványokat?</string>
     <string name="mtm_decision_always">Mindig</string>
diff --git a/News-Android-App/src/main/res/values-is/strings.xml b/News-Android-App/src/main/res/values-is/strings.xml
index bac3ae9a..4f46e2d8 100644
--- a/News-Android-App/src/main/res/values-is/strings.xml
+++ b/News-Android-App/src/main/res/values-is/strings.xml
@@ -144,9 +144,6 @@
     <string name="pref_title_ShowFastActions">Virkja aðgerðir fyrir skyndiaðgang</string>
     <string name="pref_title_OpenInBrowserDirectly">Sleppa ítarlegri sýn og opna greinina í vafranum</string>
 
-    <string name="dialog_feature_not_available">Þessi eiginleiki er ekki tiltækur í þessari (frjálsu-opnu/open-source) útgáfu forritsins. Ef þú ætlar að nota þennan eiginleika ættirðu að sækja forritið í GitHub hugbúnaðarsafnið eða ná í forritið úr Google Play Store safninu.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Samþykkja óþekkt skilríki?</string>
     <string name="mtm_decision_always">Alltaf</string>
diff --git a/News-Android-App/src/main/res/values-it/strings.xml b/News-Android-App/src/main/res/values-it/strings.xml
index cad01e9b..0205d7a8 100644
--- a/News-Android-App/src/main/res/values-it/strings.xml
+++ b/News-Android-App/src/main/res/values-it/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Attiva funzioni di accesso rapido</string>
     <string name="pref_title_OpenInBrowserDirectly">Salta la vista dettagliata e apri l\'articolo nel browser</string>
 
-    <string name="dialog_feature_not_available">Questa funzionalità non è disponibile in questa versione (open-source) dell\'applicazione. Se vuoi utilizzare questa funzionalità, scarica l\'applicazione dal repository GitHub o dal Google PlayStore.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Vuoi accettare un certificato sconosciuto?</string>
     <string name="mtm_decision_always">Sempre</string>
diff --git a/News-Android-App/src/main/res/values-ja-rJP/strings.xml b/News-Android-App/src/main/res/values-ja-rJP/strings.xml
index 469ebb77..cefc23a0 100644
--- a/News-Android-App/src/main/res/values-ja-rJP/strings.xml
+++ b/News-Android-App/src/main/res/values-ja-rJP/strings.xml
@@ -142,9 +142,6 @@
     <string name="pref_title_ShowFastActions">高速アクセス機能を有効化</string>
     <string name="pref_title_OpenInBrowserDirectly">詳細な表示をスキップし、ブラウザで記事を開く</string>
 
-    <string name="dialog_feature_not_available">この機能は、このアプリのこの（オープンソース）バージョンでは利用できません。 この機能を使用するには、GitHubリポジトリからアプリをダウンロードするか、Google Playストアからアプリをダウンロードしてください。</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">未知の証明書を受け入れますか？</string>
     <string name="mtm_decision_always">常に</string>
diff --git a/News-Android-App/src/main/res/values-ko/strings.xml b/News-Android-App/src/main/res/values-ko/strings.xml
index 62f2b474..3a3fc372 100644
--- a/News-Android-App/src/main/res/values-ko/strings.xml
+++ b/News-Android-App/src/main/res/values-ko/strings.xml
@@ -142,9 +142,6 @@
     <string name="pref_title_ShowFastActions">빠른 액세스 기능 활성화</string>
     <string name="pref_title_OpenInBrowserDirectly">상세보기를 건너뛰고 기사를 브라우저에서 열기</string>
 
-    <string name="dialog_feature_not_available">이 앱의 이(오픈 소스) 버전에서는 이 기능을 사용할 수 없습니다. 이 기능을 사용하려면 GitHub Repository에서 앱을 다운로드하거나 Google Play Store에서 앱을 다운로드하세요.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">알 수 없는 인증서를 허용하시겠습니까?</string>
     <string name="mtm_decision_always">항상</string>
diff --git a/News-Android-App/src/main/res/values-nb-rNO/strings.xml b/News-Android-App/src/main/res/values-nb-rNO/strings.xml
index 3c3ee758..8bdb66e0 100644
--- a/News-Android-App/src/main/res/values-nb-rNO/strings.xml
+++ b/News-Android-App/src/main/res/values-nb-rNO/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Aktiver funksjoner for rask tilgang</string>
     <string name="pref_title_OpenInBrowserDirectly">Dropp detaljert visning og åpne artikkel i nettleser</string>
 
-    <string name="dialog_feature_not_available">Funksjonalitet er ikke tilgjengelig i denne (åpen kildekode) versjon. Hvis du ønsker å bruke denne funksjonen kan den lastes ned via GitHub eller fra Google Play butikken.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Aksepter ukjent sertifikat?</string>
     <string name="mtm_decision_always">Alltid</string>
diff --git a/News-Android-App/src/main/res/values-nl/strings.xml b/News-Android-App/src/main/res/values-nl/strings.xml
index 5fa4e851..dd1a3789 100644
--- a/News-Android-App/src/main/res/values-nl/strings.xml
+++ b/News-Android-App/src/main/res/values-nl/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Active snelle toegangsfuncties</string>
     <string name="pref_title_OpenInBrowserDirectly">Sla detailvoorbeeld over en open artikel in browser</string>
 
-    <string name="dialog_feature_not_available">Deze feature is niet beschikbaar in deze (open-source) versie van deze app. Indien je deze feature wilt gebruiken, download dan alsjeblieft de app van de GitHub Repository of de Google Play Store.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Onbekend certificaat accepteren?</string>
     <string name="mtm_decision_always">Altijd</string>
diff --git a/News-Android-App/src/main/res/values-oc/strings.xml b/News-Android-App/src/main/res/values-oc/strings.xml
index c49a2c74..d91af366 100644
--- a/News-Android-App/src/main/res/values-oc/strings.xml
+++ b/News-Android-App/src/main/res/values-oc/strings.xml
@@ -102,7 +102,8 @@
     <!-- Podcast -->
     <string name="no_podcast_selected">Cap de podcast pas seleccionat</string>
     <!-- Settings for About -->
-    <string name="pref_header_about">A prepaus de</string>
+    <string name="pref_header_about">A prepaus</string>
+    <string name="pref_privacy">Confidencialitat</string>
     <!-- Settings for Display -->
     <string name="pref_header_display">Afichatge</string>
     <string name="pref_title_feed_list_layout">Disposicion de la lista dels fluxes</string>
@@ -110,6 +111,7 @@
     <string name="pref_display_apptheme_dark">Escur</string>
 
     <string name="pref_display_font_size_d">Defaut</string>
+    <string name="content_desc_show_password">Mostrar lo senhal</string>
     <string name="content_desc_delete">suprimir</string>
     <!-- Settings for Notifications -->
     <string name="pref_header_notifications">Notificacions</string>
diff --git a/News-Android-App/src/main/res/values-pl/strings.xml b/News-Android-App/src/main/res/values-pl/strings.xml
index 555d1366..3214a4d0 100644
--- a/News-Android-App/src/main/res/values-pl/strings.xml
+++ b/News-Android-App/src/main/res/values-pl/strings.xml
@@ -157,9 +157,6 @@
     <string name="pref_title_ShowFastActions">Aktywuj funkcje szybkiego dostępu</string>
     <string name="pref_title_OpenInBrowserDirectly">Pomiń widok szczegółów i otwórz artykuł w przeglądarce</string>
 
-    <string name="dialog_feature_not_available">Ta funkcja nie jest dostępna w tej wersji aplikacji (open-source). Jeśli chcesz skorzystać z tej funkcji, pobierz aplikację z repozytorium GitHub lub pobierz aplikację ze sklepu Google Play.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Akceptować nieznane certyfikaty?</string>
     <string name="mtm_decision_always">Zawsze</string>
diff --git a/News-Android-App/src/main/res/values-pt-rBR/strings.xml b/News-Android-App/src/main/res/values-pt-rBR/strings.xml
index 09720c1d..c34acd65 100644
--- a/News-Android-App/src/main/res/values-pt-rBR/strings.xml
+++ b/News-Android-App/src/main/res/values-pt-rBR/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Ativar as funções de acesso rápido</string>
     <string name="pref_title_OpenInBrowserDirectly">Saltar exibição detalhada e abrir o artigo no navegador</string>
 
-    <string name="dialog_feature_not_available">Este recurso não está disponível nesta versão deste aplicativo (de código aberto). Se você quiser usá-lo, baixe o aplicativo do repositório do GitHub ou faça o download na Google Play Store.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Aceita Certificado Desconhecido?</string>
     <string name="mtm_decision_always">Sempre</string>
diff --git a/News-Android-App/src/main/res/values-pt-rPT/strings.xml b/News-Android-App/src/main/res/values-pt-rPT/strings.xml
index ed1b023b..2af619be 100644
--- a/News-Android-App/src/main/res/values-pt-rPT/strings.xml
+++ b/News-Android-App/src/main/res/values-pt-rPT/strings.xml
@@ -131,9 +131,6 @@
     <string name="pref_title_DisableHostnameVerification">Desativar a Verificação do Nome de Anfitrião</string>
     <string name="pref_title_NavigateWithVolumeButtons">Navegue com os botões do volume</string>
     <string name="pref_title_MarkAsReadWhileScrolling">Marcar como lido enquanto rolar com o rato</string>
-    <string name="dialog_feature_not_available">Esta funcionalidade não está disponível nesta versão (código aberto) desta aplicação. Se quiser usar esta funcionalidade, por favor, transfira a aplicação do Repositório do GitHub ou transfira a \'Aplicação\' da Google Play Store.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Aceitar os certificados desconhecidos?</string>
     <string name="mtm_decision_always">Sempre</string>
diff --git a/News-Android-App/src/main/res/values-ru/strings.xml b/News-Android-App/src/main/res/values-ru/strings.xml
index 4b8283dc..e39baa70 100644
--- a/News-Android-App/src/main/res/values-ru/strings.xml
+++ b/News-Android-App/src/main/res/values-ru/strings.xml
@@ -157,9 +157,6 @@
     <string name="pref_title_ShowFastActions">Включить функции быстрого доступа</string>
     <string name="pref_title_OpenInBrowserDirectly">Пропустить детальный обзор и открыть статью в браузере</string>
 
-    <string name="dialog_feature_not_available">Эта возможность недоступна в установленной (open-source) версии приложения. Для использования этой возможности загрузите приложение из репозитория GitHub или установите его из Google Play Маркет.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Принять неизвестный сертификат?</string>
     <string name="mtm_decision_always">Всегда</string>
@@ -182,6 +179,8 @@
     <string name="pref_report_issue_summary">Требуется (бесплатный) аккаунт GitHub</string>
     <string name="pref_contribute">Внесите свой вклад!</string>
     <string name="pref_contribute_summary">Получить исходный код</string>
+    <string name="pref_privacy">Конфиденциальность</string>
+    <string name="pref_privacy_summary">Политика конфиденциальности новостей Nextcloud Android </string>
     <string name="pref_version">Приложение Nextcloud Новости для Android</string>
 
 
diff --git a/News-Android-App/src/main/res/values-sc/strings.xml b/News-Android-App/src/main/res/values-sc/strings.xml
index a9bb96d9..add48a9f 100644
--- a/News-Android-App/src/main/res/values-sc/strings.xml
+++ b/News-Android-App/src/main/res/values-sc/strings.xml
@@ -31,7 +31,7 @@
 
     <!-- Action Bar Items -->
     <string name="action_starred">Preferidos</string>
-    <string name="action_read">Leghidura</string>
+    <string name="action_read">Letura</string>
     <string name="action_playPodacst">Riprodue Podcast</string>
     <string name="action_openInBrowser">Aberi in su navigadore Web</string>
     <string name="action_Share">Cumpartzi</string>
@@ -40,7 +40,7 @@
     <string name="action_settings">Impostatziones</string>
     <string name="action_sync_settings">Sincroniza impostatziones</string>
     <string name="action_add_new_feed">Agiunghe fonte noa</string>
-    <string name="action_textToSpeech">Leghidura vocale</string>
+    <string name="action_textToSpeech">Letura vocale</string>
     <string name="action_search">Chirca</string>
     <string name="action_download_articles_offline">Iscàrriga artìculos fora de lìnia</string>
     <!-- notifications -->
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Ativa funtziones de atzessu lestru</string>
     <string name="pref_title_OpenInBrowserDirectly">Brinca sa vista a sa minuda e aberi s\'artìculu in su navigadore</string>
 
-    <string name="dialog_feature_not_available">Custa funtzionalidade no est a disponimentu in custa versione (còdighe abertu) de s\'aplicatzione. Si cheres impreare custa funtzionalidade, iscàrriga s\'aplicatzione dae su  depòsitu GitHub o dae Google PlayStore.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Cheres atzetare unu tzertificadu disconnotu?</string>
     <string name="mtm_decision_always">Semper</string>
@@ -196,7 +193,7 @@
 
     <string name="pref_display_browser_cct"> Ischedas personalizadas de Chrome integradas</string>
     <string name="pref_display_browser_built_in">Navigadore integradu</string>
-    <string name="pref_display_browser_external">Navigadore esternu</string>
+    <string name="pref_display_browser_external">Navigadore foranu</string>
 
     <string name="pref_display_feed_list_layout_thumbnails">Miniaturas</string>
     <string name="pref_display_feed_list_layout_simple_text">Testu simpre</string>
@@ -220,4 +217,50 @@
     <string name="content_desc_collapse">mìnima</string>
     <string name="content_desc_mark_as_read">sinna comente lèghidu</string>
     <string name="content_desc_mark_as_unread">sinna comente non lèghidu</string>
+    <string name="content_desc_tap_to_refresh">toca pro agiornare</string>
+    <string name="content_desc_add_to_favorites">agiunghe a is preferidos</string>
+    <string name="content_desc_remove_from_favorites">boga dae is preferidos</string>
+    <string name="content_desc_show_password">mustra crae</string>
+    <string name="content_desc_delete">cantzella</string>
+    <string name="content_desc_download">iscàrriga</string>
+
+
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">Notìficas</string>
+    <string name="pref_title_notification_new_articles_available">Mustra notìficas cando b\'at artìculos a disponimentu</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">Errore</string>
+    <string name="login_dialog_text_news_app_not_installed_on_server" formatted="true">Paret chi is aplicatziones noas non sunt installadas o ativadas in su serbidore tuo. Pro praghere, sighi is istrutziones frunidas inoghe pro cunfigurare is aplicatziones noas in su serbidore: %1$s</string>
+    <string name="login_dialog_text_something_went_wrong">Ddoe at àpidu un\'errore :(</string>
+    <string name="login_dialog_text_zero_version_code">S\'aplicatzione Web News at torradu sa Version \"0\". Càstias a sa sinnalatzione de bug inoghe in fatu:https://github.com/nextcloud/news/issues/5#issuecomment-242883795</string>
+    <string name="login_dialog_text_not_compatible">Sa versione de custa aplicatzione no est cumpatìbile cun s\'aplicatzione News de Nextcloud. Agiorna s\'aplicatzione e su framework.</string>
+    <string name="login_dialog_title_security_warning">Avisu de Seguridade</string>
+    <string name="login_dialog_text_security_warning">Non ses impreende HTTPS, chi est cussigiadu forte. Unu malintentzionadu diat pòdere intertzetare su tràficu tuo e otènnere s\'atzessu a datos sensìbiles (pro nàrrere, sa crae).</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">Datos &amp; e sincronizzazione</string>
+    <string name="pref_title_clearCache">Lìmpia memòria temporànea</string>
+    <string name="pref_title_CacheImagesOffline">Immàgines de memòria temporànea foras de lìnia</string>
+    <string name="pref_title_Max_Cache_Size">Mannària Màssima de sa Memòria Temporànea</string>
+
+    <string name="pref_data_sync_image_cache_never">Mai</string>
+    <string name="pref_data_sync_image_cache_wifi_only">Cun su WiFi ebbia</string>
+    <string name="pref_data_sync_image_cache_wifi_and_mobile">Cun su WiFi &amp; e Mòbile</string>
+    <string name="pref_data_sync_image_cache_ask">Pregonta si no ses connètidu a su WiFi</string>
+
+    <string name="array_sync_interval_min_0">Mai</string>
+    <string name="array_sync_interval_min_5">5 Minutos</string>
+    <string name="array_sync_interval_min_15">15 Minutos</string>
+    <string name="array_sync_interval_min_30">30 Minutos</string>
+    <string name="array_sync_interval_min_45">45 Minutos</string>
+    <string name="array_sync_interval_hour_1">1 Ora</string>
+    <string name="array_sync_interval_hour_2">2 Oras</string>
+    <string name="array_sync_interval_hour_3">3 Oras</string>
+    <string name="array_sync_interval_hour_6">6 Oras</string>
+    <string name="array_sync_interval_hour_12">12 Oras</string>
+    <string name="array_sync_interval_hour_24">24 Oras</string>
+
     </resources>
diff --git a/News-Android-App/src/main/res/values-sk-rSK/strings.xml b/News-Android-App/src/main/res/values-sk-rSK/strings.xml
index 7539bf19..857b1422 100644
--- a/News-Android-App/src/main/res/values-sk-rSK/strings.xml
+++ b/News-Android-App/src/main/res/values-sk-rSK/strings.xml
@@ -154,9 +154,6 @@
     <string name="pref_title_ShowFastActions">Aktivovať funkcie pre rýchly prístup</string>
     <string name="pref_title_OpenInBrowserDirectly">Preskočte podrobné zobrazenie a otvorte článok v prehliadači</string>
 
-    <string name="dialog_feature_not_available">Táto funkcia nie je k dispozícii v tejto (otvorenej) verzii tejto aplikácie. Ak chcete túto funkciu používať, stiahnite si aplikáciu z úložiska GitHub alebo si ju stiahnite z Obchodu Google Play.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Prijať neznámy certifikát?</string>
     <string name="mtm_decision_always">Vždy</string>
diff --git a/News-Android-App/src/main/res/values-sl/strings.xml b/News-Android-App/src/main/res/values-sl/strings.xml
index fc360170..946c9c77 100644
--- a/News-Android-App/src/main/res/values-sl/strings.xml
+++ b/News-Android-App/src/main/res/values-sl/strings.xml
@@ -157,9 +157,6 @@
     <string name="pref_title_ShowFastActions">Omogoči možnosti hitrega dostopa</string>
     <string name="pref_title_OpenInBrowserDirectly">Preskoči podrobni pogled in odpri vir v brskalniku</string>
 
-    <string name="dialog_feature_not_available">Možnost v tej (odprtokodni) različici ni na voljo. Če želite to možnost uporabiti, prejmite program neposredno iz skladišča GitHub, ali pa ga namestite prek Googlove trgovine Play.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Ali želite prejeti neznano digitalno potrdilo?</string>
     <string name="mtm_decision_always">Vedno</string>
diff --git a/News-Android-App/src/main/res/values-sr-rSP/strings.xml b/News-Android-App/src/main/res/values-sr-rSP/strings.xml
index 3dc18395..d255f5b4 100644
--- a/News-Android-App/src/main/res/values-sr-rSP/strings.xml
+++ b/News-Android-App/src/main/res/values-sr-rSP/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_MarkAsReadWhileScrolling">Označi kao pročitano tokom klizanja</string>
     <string name="pref_title_OpenInBrowserDirectly">Preskoči detaljni pregled i odmah otvori članak u pregledaču</string>
 
-    <string name="dialog_feature_not_available">Ova mogućnost nije dostupna u ovoj verziji (otvorenog koda). Ako želite da je koristite, preuzmite aplikaciju sa Githab riznice ili skinite aplikaciju sa Gugl Plej prodavnice.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Prihvatiti nepoznati sertifikat?</string>
     <string name="mtm_decision_always">Uvek</string>
diff --git a/News-Android-App/src/main/res/values-sr/strings.xml b/News-Android-App/src/main/res/values-sr/strings.xml
index 5c5d51c0..8b21806a 100644
--- a/News-Android-App/src/main/res/values-sr/strings.xml
+++ b/News-Android-App/src/main/res/values-sr/strings.xml
@@ -152,9 +152,6 @@
     <string name="pref_title_ShowFastActions">Активирај функције за брзи приступ</string>
     <string name="pref_title_OpenInBrowserDirectly">Прескочи детаљни преглед и одмах отвори чланак у прегледачу</string>
 
-    <string name="dialog_feature_not_available">Ова могућност није доступна у овој верзији (отвореног кода). Ако желите да је користите, преузмите апликацију са Гитхаб ризнице или скините апликацију са Гугл Плеј продавнице.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Прихватити непознати сертификат?</string>
     <string name="mtm_decision_always">Увек</string>
diff --git a/News-Android-App/src/main/res/values-sv/strings.xml b/News-Android-App/src/main/res/values-sv/strings.xml
index f940b8dd..f267d165 100644
--- a/News-Android-App/src/main/res/values-sv/strings.xml
+++ b/News-Android-App/src/main/res/values-sv/strings.xml
@@ -144,9 +144,6 @@
     <string name="pref_title_ShowFastActions">Aktivera snabbåtkomstsfunktioner</string>
     <string name="pref_title_OpenInBrowserDirectly">Hoppa över detaljerad vy och öppna artikeln i webbläsare</string>
 
-    <string name="dialog_feature_not_available">Den här funktionen är inte tillgänglig i den här (öppen källkod) versionen av den här appen. Om du vill använda den här funktionen, vänligen hämta appen från GitHub-förrådet eller hämta appen från Google Play-butiken.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Acceptera okänt certifikat?</string>
     <string name="mtm_decision_always">Alltid</string>
diff --git a/News-Android-App/src/main/res/values-tr/strings.xml b/News-Android-App/src/main/res/values-tr/strings.xml
index 3124adfc..d09eab32 100644
--- a/News-Android-App/src/main/res/values-tr/strings.xml
+++ b/News-Android-App/src/main/res/values-tr/strings.xml
@@ -147,9 +147,6 @@
     <string name="pref_title_ShowFastActions">Hızlı erişim işlevlerini etkinleştir</string>
     <string name="pref_title_OpenInBrowserDirectly">Ayrıntılı görünümü atlayıp makaleyi tarayıcıda aç</string>
 
-    <string name="dialog_feature_not_available">Bu özellik uygulamanın bu sürümünde (açık kaynaklı) kullanılamaz. Bu özelliği kullanmak istiyorsanız lütfen uygulamayı GitHub deposundan ya da Google Play Store üzerinden indirin.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Bilinmeyen Sertifika Kabul Edilsin mi?</string>
     <string name="mtm_decision_always">Her Zaman</string>
diff --git a/News-Android-App/src/main/res/values-zh-rCN/strings.xml b/News-Android-App/src/main/res/values-zh-rCN/strings.xml
index a3d89d4e..373bce2c 100644
--- a/News-Android-App/src/main/res/values-zh-rCN/strings.xml
+++ b/News-Android-App/src/main/res/values-zh-rCN/strings.xml
@@ -142,9 +142,6 @@
     <string name="pref_title_ShowFastActions">激活快速访问功能</string>
     <string name="pref_title_OpenInBrowserDirectly">跳过详情查看并在浏览器中打开文章</string>
 
-    <string name="dialog_feature_not_available">当前功能在此（开源）版本未开放。如果您想使用此功能，请从 GitHub 仓库中下载或从 Google Play Store 中下载。</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">允许未知证书？</string>
     <string name="mtm_decision_always">总是</string>
diff --git a/News-Android-App/src/main/res/values-zh-rHK/strings.xml b/News-Android-App/src/main/res/values-zh-rHK/strings.xml
new file mode 100644
index 00000000..3e1cdc89
--- /dev/null
+++ b/News-Android-App/src/main/res/values-zh-rHK/strings.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="auto_sync_string">自動同步</string>
+    <string name="title_activity_sync_interval_selector">同步時間間距</string>
+    <string name="empty_view_content">無任何項目</string>
+    <string name="toast_GettingMoreItems">正在開始下載更多項目...請稍後</string>
+    <string name="no_wifi_available">WiFi 未連線</string>
+    <string name="do_you_want_to_download_without_wifi">是否要在沒有 WiFi 的狀況下下載圖像</string>
+    <string name="current_version">您在使用版本 %s</string>
+    <string name="widget_header">Nextcloud 新聞</string>
+    <plurals name="message_bar_new_articles_available">
+        <item quantity="other">%d 個新的項目</item>
+    </plurals>
+    <string name="message_bar_reload">重新載入</string>
+    <string name="allUnreadFeeds">所有未閱讀項目</string>
+    <string name="starredFeeds">星號項目</string>
+    <string name="title_activity_new_feed">加入新訂閱</string>
+
+    <string name="menu_update">重新整理</string>
+    <string name="menu_markAllAsRead">全部標示為已閱讀</string>
+    <string name="menu_StartImageCaching">下載圖像</string>
+    <string name="menu_downloadMoreItems">下載更多項目</string>
+
+    <string name="tv_showing_cached_version">顯示快取的版本</string>
+
+    <string name="permission_req_location_twilight_title">自動切換明亮/暗黑主題</string>
+    <string name="permission_req_location_twilight_text">為了自動切換明亮與暗黑主題，請提供裝置位置，以便取得日照時間</string>
+
+    <!-- Action Bar Items -->
+    <string name="action_starred">星號</string>
+    <string name="action_read">已讀</string>
+    <string name="action_playPodacst">播放 Podcast</string>
+    <string name="action_openInBrowser">用瀏覽器開啟</string>
+    <string name="action_Share">分享</string>
+    <string name="action_login">伺服器設定</string>
+    <string name="action_save">儲存</string>
+    <string name="action_settings">設定</string>
+    <string name="action_sync_settings">同步設定</string>
+    <string name="action_add_new_feed">加入新訂閱</string>
+    <string name="action_textToSpeech">讀出</string>
+    <string name="action_search">搜尋</string>
+    <string name="action_download_articles_offline">下載離線文章</string>
+    <!-- notifications -->
+    <string name="notification_download_articles_offline">下載文章供離線使用</string>
+    <string name="notification_download_images_offline">下載影像供離線使用</string>
+    <plurals name="notification_new_items_ticker">
+        <item quantity="other">您有 %d 個新的未讀項目</item>
+    </plurals>
+    <plurals name="notification_new_items_text">
+        <item quantity="other">%d 個新的未讀項目</item>
+    </plurals>
+
+    <!-- Add new feed -->
+    <string name="hint_feed_url">提要URL</string>
+    <string name="action_add_feed">新增訂閱</string>
+    <string name="import_opml">導入OPML格式</string>
+    <string name="export_opml">導出OPML格式</string>
+
+
+    <!-- String related to NewsDetail-ContextMenu Items -->
+    <string name="action_img_download">下載圖片</string>
+    <string name="action_img_sharelink">分享圖片連結</string>
+    <string name="action_img_open">在瀏覽器中開啟圖片</string>
+    <string name="action_img_copylink">複製圖片連結</string>
+    <string name="action_link_share">分享連結</string>
+    <string name="action_link_open">在瀏覽器中打開連結</string>
+    <string name="action_link_copy">複製連結</string>
+    <string name="toast_img_download_wait">下載中…請稍候</string>
+    <string name="toast_img_saved">圖片已儲存</string>
+    <string name="toast_img_notwriteable">寫入圖片失敗</string>
+    <string name="toast_copied_to_clipboard">已複製到剪貼板</string>
+    <string name="error_download_failed">下載失敗</string>
+    <string name="intent_title_share">分享到</string>
+
+
+    <!-- Strings related to NewsReaderListDialogFragment (Rename/Remove Feed) -->
+    <string name="action_feed_remove">移除 Feed</string>
+    <string name="action_feed_rename">重新命名 Feed</string>
+    <string name="action_feed_move">移動摘要</string>
+    <string name="feed_remove_button">移除</string>
+    <string name="feed_rename_button">重新命名</string>
+    <string name="confirm_feed_remove">您真的要移除這個 Feed 嗎？此動作無法復原</string>
+    <string name="feed_move_list_description">選擇要移動摘要至的資料夾</string>
+    <string name="move_feed_root_folder">根目錄</string>
+
+    <!-- Strings related to login -->
+    <string name="login_manual">手動登入</string>
+    <string name="login_sso">使用 Nextcloud Files 應用程式登入</string>
+    <string name="pref_title_username">用戶名稱</string>
+    <string name="pref_title_password">密碼</string>
+    <string name="pref_title_owncloudRootPath">NextCloud 根目錄</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/nextcloud</string>
+
+    <string name="action_sign_in_short">登入</string>
+    <string name="login_progress_signing_in">登入中…</string>
+    <!-- <string name="error_incorrect_password">Incorrect password</string> -->
+    <string name="error_field_required">此欄位為必填</string>
+    <string name="error_invalid_url">錯誤的網路連結</string>
+
+
+    <!-- Toast Messages -->
+    <plurals name="toast_downloaded_x_items">
+        <item quantity="other">已下載 %d 個舊項目</item>
+    </plurals>
+    <string name="toast_no_more_downloads_available">已經載入所有項目</string>
+    <plurals name="fetched_items_so_far">
+        <item quantity="other">目前已取得 %d 項…</item>
+    </plurals>
+
+
+    <!-- Strings related to Settings -->
+    <string name="title_activity_settings">設定</string>
+    <string name="cache_is_cleared">快取已清除</string>
+
+
+    <!-- General settings -->
+    <string name="pref_header_general">一般</string>
+    <string name="pref_title_general_sort_order">排序依據</string>
+
+    <string name="pref_general_sort_order_new_old">新 → 舊</string>
+    <string name="pref_general_sort_order_old_new">舊 → 新</string>
+
+    <string name="pref_rename_action_swipe_right">往右滑的動作</string>
+    <string name="pref_rename_action_swipe_left">往左滑的動作</string>
+
+    <string name="pref_title_general_search_in">搜尋</string>
+
+    <string name="pref_general_search_in_title">標題</string>
+    <string name="pref_general_search_in_body">內文</string>
+
+    <string name="dialog_clearing_cache">正在清除快取</string>
+    <string name="dialog_clearing_cache_please_wait">正在清除快取…請稍候</string>
+    <string name="reset_cache_unsaved_changes">有未同步的更動，您仍然要重設快取嗎？</string>
+    <string name="warning">警告</string>
+    <string name="pref_title_AutoSyncOnStart">啟動時同步</string>
+    <string name="pref_title_ShowOnlyUnread">只顯示未讀的條目</string>
+    <string name="pref_title_DisableHostnameVerification">停用主機名稱檢驗</string>
+    <string name="pref_title_NavigateWithVolumeButtons">用音量鍵瀏覽</string>
+    <string name="pref_title_MarkAsReadWhileScrolling">當滾動時標為已讀</string>
+    <string name="pref_title_ShowFastActions">啟用快速存取功能</string>
+    <string name="pref_title_OpenInBrowserDirectly">略過詳細檢視，並在瀏覽器開啟文章</string>
+
+    <!-- MemorizingTrustManager -->
+    <string name="mtm_accept_cert">允許未知憑證？</string>
+    <string name="mtm_decision_always">總是</string>
+    <string name="mtm_decision_abort">中斷</string>
+    <string name="mtm_notification">憑證驗證</string>
+
+
+    <!-- Podcast -->
+    <string name="no_podcast_selected">沒有選擇 podcast</string>
+    <string name="no_chapters_available">沒有章節</string>
+    <string name="podcast_playback_speed_dialog_title">播放速度</string>
+    <string name="notification_downloading_podcast_title">正在下載音訊資料</string>
+
+
+    <!-- Settings for About -->
+    <string name="pref_header_about">關於</string>
+    <string name="pref_license">授權</string>
+    <string name="pref_license_summary">GNU Affero 通用公眾授權條款 (GNU AGPL) 第 3 版</string>
+    <string name="pref_report_issue">回報問題</string>
+    <string name="pref_report_issue_summary">需要一個 (免費的) GitHub 賬戶</string>
+    <string name="pref_contribute">貢獻</string>
+    <string name="pref_contribute_summary">取得原始碼</string>
+    <string name="pref_privacy">隱私</string>
+    <string name="pref_privacy_summary">Nextcloud 新聞 Android 隱私政策</string>
+    <string name="pref_version">Nextcloud News Android 應用程式</string>
+
+
+    <!-- Settings for Display -->
+    <string name="pref_header_display">顯示</string>
+    <string name="pref_title_app_theme">佈景主題</string>
+    <string name="pref_title_feed_list_layout">Feed 清單版型</string>
+    <string name="pref_title_font_size">字型大小</string>
+    <string name="pref_display_browser">瀏覽器</string>
+
+
+    <string name="pref_display_news_detail_actionbar_icons_title">動作圖示 (詳細檢視)</string>
+
+    <string name="pref_display_apptheme_auto">明亮 / 暗黑 (根據日照時間)</string>
+    <string name="pref_display_apptheme_light">亮色</string>
+    <string name="pref_display_apptheme_dark">暗色</string>
+
+    <string name="pref_oled_mode">黑色背景</string>
+    <string name="pref_oled_mode_summary">供 OLED 螢幕使用的暗黑主題</string>
+
+    <string name="pref_display_browser_cct">內建 Chrome 自訂分頁</string>
+    <string name="pref_display_browser_built_in">內建瀏覽器</string>
+    <string name="pref_display_browser_external">外部瀏覽器</string>
+
+    <string name="pref_display_feed_list_layout_thumbnails">縮圖</string>
+    <string name="pref_display_feed_list_layout_simple_text">簡單文字</string>
+    <string name="pref_display_feed_list_layout_headlines">標題</string>
+    <string name="pref_display_feed_list_layout_full_text">全文</string>
+    <string name="pref_display_feed_list_layout_web_layout">Web 版面配置</string>
+    <string name="pref_display_feed_list_layout_card_view">卡片檢視</string>
+
+    <!-- font size scaling definitions -->
+    <string name="pref_display_font_size_s">小</string>
+    <string name="pref_display_font_size_d">預設</string>
+    <string name="pref_display_font_size_l">大</string>
+    <string name="pref_display_font_size_xl">特大</string>
+
+    <string name="content_desc_play">播放</string>
+    <string name="content_desc_pause">暫停</string>
+    <string name="content_desc_playback_speed">播放速度</string>
+    <string name="content_desc_rewind">倒帶</string>
+    <string name="content_desc_forward">快進</string>
+    <string name="content_desc_expand">展開</string>
+    <string name="content_desc_collapse">收合</string>
+    <string name="content_desc_mark_as_read">標為已讀</string>
+    <string name="content_desc_mark_as_unread">標為未讀</string>
+    <string name="content_desc_tap_to_refresh">輕觸以更新</string>
+    <string name="content_desc_add_to_favorites">加到最愛</string>
+    <string name="content_desc_remove_from_favorites">從最愛移除</string>
+    <string name="content_desc_show_password">顯示密碼</string>
+    <string name="content_desc_delete">刪除</string>
+    <string name="content_desc_download">下載</string>
+
+
+    <!-- Settings for Notifications -->
+    <string name="pref_header_notifications">通知</string>
+    <string name="pref_title_notification_new_articles_available">當有新條目時顯示通知</string>
+
+
+    <!-- Login Dialog -->
+    <string name="login_dialog_title_error">錯誤</string>
+    <string name="login_dialog_text_news_app_not_installed_on_server" formatted="true">似乎您未在伺服器安裝或啟用您的 News App。請遵循此處提示，先在您的伺服器安裝 News App：%1$s</string>
+    <string name="login_dialog_text_something_went_wrong">發生錯誤了 :(</string>
+    <string name="login_dialog_text_zero_version_code">網頁 News App 回傳版本為「0」。請看看下述錯誤回報：https://github.com/nextcloud/news/issues/5#issuecomment-242883795</string>
+    <string name="login_dialog_text_not_compatible">此 App 版本與您的Nextcloud News App 不兼容，請更新 Nextcloud News 應用程式和 appframework</string>
+    <string name="login_dialog_title_security_warning">安全性警告</string>
+    <string name="login_dialog_text_security_warning">您不是使用 HTTPS，攻擊者可能攔截您的通訊，進而取得敏感資料（例如您的密碼）</string>
+
+
+    <!-- Data & Sync -->
+    <string name="pref_header_data_sync">資料 &amp; 同步</string>
+    <string name="pref_title_clearCache">清除快取</string>
+    <string name="pref_title_CacheImagesOffline">暫存離線圖片</string>
+    <string name="pref_title_Max_Cache_Size">最大快取容量</string>
+
+    <string name="pref_data_sync_image_cache_never">絕不</string>
+    <string name="pref_data_sync_image_cache_wifi_only">只透過 WiFi</string>
+    <string name="pref_data_sync_image_cache_wifi_and_mobile">透過 Wi-Fi 和流動網路</string>
+    <string name="pref_data_sync_image_cache_ask">當未連接到 WiFi 時詢問</string>
+
+    <string name="array_sync_interval_min_0">絕不</string>
+    <string name="array_sync_interval_min_5">5 分鐘</string>
+    <string name="array_sync_interval_min_15">15 分鐘</string>
+    <string name="array_sync_interval_min_30">30 分鐘</string>
+    <string name="array_sync_interval_min_45">45 分鐘</string>
+    <string name="array_sync_interval_hour_1">1 小時</string>
+    <string name="array_sync_interval_hour_2">2 小時</string>
+    <string name="array_sync_interval_hour_3">3 小時</string>
+    <string name="array_sync_interval_hour_6">6 小時</string>
+    <string name="array_sync_interval_hour_12">12 小時</string>
+    <string name="array_sync_interval_hour_24">24 小時</string>
+
+    </resources>
diff --git a/News-Android-App/src/main/res/values-zh-rTW/strings.xml b/News-Android-App/src/main/res/values-zh-rTW/strings.xml
index 9c1a0f98..453db128 100644
--- a/News-Android-App/src/main/res/values-zh-rTW/strings.xml
+++ b/News-Android-App/src/main/res/values-zh-rTW/strings.xml
@@ -142,9 +142,6 @@
     <string name="pref_title_ShowFastActions">啟用快速存取功能</string>
     <string name="pref_title_OpenInBrowserDirectly">略過詳細檢視，並在瀏覽器開啟文章</string>
 
-    <string name="dialog_feature_not_available">本功能無法在此應用版本 (開源版本) 中使用。若您希望使用此功能，請從 GitHub Repository 或 Google Play 商店中下載應用程式。</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">允許未知憑證？</string>
     <string name="mtm_decision_always">總是</string>
diff --git a/News-Android-App/src/main/res/values/strings.xml b/News-Android-App/src/main/res/values/strings.xml
index 219ffdb9..3e3eca96 100644
--- a/News-Android-App/src/main/res/values/strings.xml
+++ b/News-Android-App/src/main/res/values/strings.xml
@@ -4,6 +4,8 @@
     <string name="auto_sync_string">Auto sync</string>
     <string name="app_name" translatable="false">News</string>
     <string name="full_app_name" translatable="false">Nextcloud News</string>
+    <string name="account_type" translatable="false">de.luhmer.owncloudnewsreader</string>
+    <string name="authority" translatable="false">de.luhmer.owncloudnewsreader</string>
     <string name="title_activity_sync_interval_selector">Sync Interval</string>
     <string name="title_activity_news_detail">NewsDetailActivity</string>
     <string name="empty_view_content">No items here</string>
@@ -184,9 +186,6 @@
     <string name="pref_title_ShowFastActions">Activate fast access functions</string>
     <string name="pref_title_OpenInBrowserDirectly">Skip detailed view and open article in the browser</string>
 
-    <string name="dialog_feature_not_available">This feature is not available in this (open-source) version of this app. If you want to use this feature please download the app from the GitHub Repository or download the App from the Google Play Store.</string>
-
-
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Accept Unknown Certificate?</string>
     <string name="mtm_decision_always">Always</string>
diff --git a/News-Android-App/src/main/res/xml/authenticator.xml b/News-Android-App/src/main/res/xml/authenticator.xml
index d81131bc..14e05b26 100644
--- a/News-Android-App/src/main/res/xml/authenticator.xml
+++ b/News-Android-App/src/main/res/xml/authenticator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-                        android:accountType="de.luhmer.owncloudnewsreader"
+                        android:accountType="@string/account_type"
                         android:icon="@mipmap/ic_launcher"
                         android:smallIcon="@mipmap/ic_launcher"
                         android:label="@string/app_name"
diff --git a/News-Android-App/src/main/res/xml/syncadapter.xml b/News-Android-App/src/main/res/xml/syncadapter.xml
index a67c2118..234843c7 100644
--- a/News-Android-App/src/main/res/xml/syncadapter.xml
+++ b/News-Android-App/src/main/res/xml/syncadapter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <sync-adapter
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="de.luhmer.owncloudnewsreader"
-	android:accountType="de.luhmer.owncloudnewsreader"
+    android:contentAuthority="@string/authority"
+	android:accountType="@string/account_type"
     android:userVisible="true"
     android:supportsUploading="false" />
\ No newline at end of file