Update podcast support

13 files changed, 103 insertions, 795 deletions

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/events/podcast/OpenAudioPodcastEvent.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/events/podcast/OpenAudioPodcastEvent.java
deleted file mode 100644
index 22f6e604..00000000
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/events/podcast/OpenAudioPodcastEvent.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package de.luhmer.owncloudnewsreader.events.podcast;
-
-/**
- * Created by David on 21.06.2014.
- */
-public class OpenAudioPodcastEvent {
-    public String pathToFile;
-    public String mediaTitle;
-}
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/events/podcast/OpenPodcastEvent.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/events/podcast/OpenPodcastEvent.java
new file mode 100644
index 00000000..ade8ebfb
--- /dev/null
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/events/podcast/OpenPodcastEvent.java
@@ -0,0 +1,17 @@
+package de.luhmer.owncloudnewsreader.events.podcast;
+
+/**
+ * Created by David on 21.06.2014.
+ */
+public class OpenPodcastEvent {
+
+    public OpenPodcastEvent(String pathToFile, String mediaTitle, boolean isVideoFile) {
+        this.pathToFile = pathToFile;
+        this.mediaTitle = mediaTitle;
+        this.isVideoFile = isVideoFile;
+    }
+
+    public boolean isVideoFile;
+    public String pathToFile;
+    public String mediaTitle;
+}
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/MenuUtilsSherlockFragmentActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/MenuUtilsSherlockFragmentActivity.java
deleted file mode 100644
index ef395650..00000000
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/MenuUtilsSherlockFragmentActivity.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
-* Android ownCloud News
-*
-* @author David Luhmer
-* @copyright 2013 David Luhmer david-dev@live.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package de.luhmer.owncloudnewsreader.helper;
-
-import android.annotation.TargetApi;
-import android.os.Build;
-import android.preference.PreferenceManager;
-import android.support.v4.app.FragmentActivity;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.actionbarsherlock.app.SherlockDialogFragment;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;
-
-import de.luhmer.owncloudnewsreader.Constants;
-import de.luhmer.owncloudnewsreader.NewsReaderDetailFragment;
-import de.luhmer.owncloudnewsreader.NewsReaderListActivity;
-import de.luhmer.owncloudnewsreader.R;
-import de.luhmer.owncloudnewsreader.VersionInfoDialogFragment;
-import de.luhmer.owncloudnewsreader.database.DatabaseConnection;
-import de.luhmer.owncloudnewsreader.reader.IReader;
-import de.luhmer.owncloudnewsreader.reader.OnAsyncTaskCompletedListener;
-import de.luhmer.owncloudnewsreader.reader.owncloud.API;
-import de.luhmer.owncloudnewsreader.reader.owncloud.OwnCloud_Reader;
-
-public class MenuUtilsSherlockFragmentActivity extends SherlockFragmentActivity {
-		
-	protected static final String TAG = "MenuUtils";
-
-	static FragmentActivity activity;
-	
-	static MenuItem menuItemSettings;
-	static MenuItem menuItemLogin;
-	static MenuItem menuItemStartImageCaching;
-	
-	
-	private static MenuItem menuItemUpdater;
-	private static MenuItem menuItemDownloadMoreItems;
-	
-	static IReader _Reader;
-	
-	/**
-	 * @return the menuItemUpdater
-	 */
-	public static MenuItem getMenuItemUpdater() {
-		return menuItemUpdater;
-	}
-
-
-	/**
-	 * @return the menuItemDownloadMoreItems
-	 */
-	public static MenuItem getMenuItemDownloadMoreItems() {
-		return menuItemDownloadMoreItems;
-	}
-
-	
-	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
-	@Override
-	protected void onResume() {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-			invalidateOptionsMenu();	  
-		}
-		super.onResume();
-	}
-	
-	
-	public static void onCreateOptionsMenu(Menu menu, MenuInflater inflater, FragmentActivity act) {
-		inflater.inflate(R.menu.news_reader, menu);
-		activity = act;
-		
-		menuItemSettings = menu.findItem(R.id.action_settings);
-		menuItemLogin = menu.findItem(R.id.action_login);
-		menuItemStartImageCaching = menu.findItem(R.id.menu_StartImageCaching);
-		
-		menuItemUpdater = menu.findItem(R.id.menu_update);
-		//menuItemMarkAllAsRead = menu.findItem(R.id.menu_markAllAsRead);
-		menuItemDownloadMoreItems = menu.findItem(R.id.menu_downloadMoreItems);
-		
-		
-		//menuItemMarkAllAsRead.setEnabled(false);
-		menuItemDownloadMoreItems.setEnabled(false);
-				
-		NewsReaderDetailFragment ndf = ((NewsReaderDetailFragment) activity.getSupportFragmentManager().findFragmentById(R.id.content_frame));
-		if(ndf != null)
-			ndf.UpdateMenuItemsState();
-	}
-
-	public static boolean onOptionsItemSelected(MenuItem item, FragmentActivity activity) {
-		switch (item.getItemId()) {				
-			case R.id.menu_About_Changelog:
-				SherlockDialogFragment dialog = new VersionInfoDialogFragment();
-		        dialog.show(activity.getSupportFragmentManager(), "VersionChangelogDialogFragment");
-				return true;
-		
-			case R.id.menu_markAllAsRead:
-				NewsReaderDetailFragment ndf = ((NewsReaderDetailFragment) activity.getSupportFragmentManager().findFragmentById(R.id.content_frame));
-				if(ndf != null)
-				{
-					/*
-					for(int i = 0; i < ndf.getListView().getChildCount(); i++)
-					{
-						 View view = ndf.getListView().getChildAt(i);
-						 CheckBox cb = (CheckBox) view.findViewById(R.id.cb_lv_item_read);
-						 if(!cb.isChecked())
-							 cb.setChecked(true);
-					}
-					*/
-					
-					DatabaseConnection dbConn = new DatabaseConnection(activity);
-					try {
-						/*
-						//dbConn.markAllItemsAsRead(ndf.getDatabaseIdsOfItems());
-						List<Integer> items = new ArrayList<Integer>();
-						
-						
-						Cursor cursor = ncla.getLvAdapter().getCursor();
-						cursor.moveToFirst();
-						do {
-							items.add(Integer.parseInt(cursor.getString(0)));
-						} while (cursor.moveToNext());
-						dbConn.markAllItemsAsRead(items);
-						*/
-						dbConn.markAllItemsAsReadForCurrentView();						
-					} finally {
-						dbConn.closeDatabase();
-					}
-					ndf.UpdateCursor();
-					
-					//If tablet view is enabled update the listview as well
-					if(activity instanceof NewsReaderListActivity)
-						((NewsReaderListActivity) activity).updateAdapter();
-					
-				}
-				return true;
-				
-			case R.id.menu_downloadMoreItems:
-				DownloadMoreItems();
-				return true;
-		}
-		return false;
-	}
-	
-	private static void DownloadMoreItems()
-	{
-        /*
-		DatabaseConnection dbConn = new DatabaseConnection(activity);
-		int count = dbConn.getCountFeedsForFolder(SubscriptionExpandableListAdapter.ALL_ITEMS, false);
-		if(count >= Constants.maxItemsCount)
-		{
-			String text = activity.getString(R.string.max_items_count_reached);
-			text = text.replace("XX", "" + Constants.maxItemsCount);
-			new AlertDialog.Builder(activity)
-					.setTitle(activity.getString(R.string.empty_view_header))
-					.setMessage(text)
-					.setPositiveButton(activity.getString(android.R.string.ok), new DialogInterface.OnClickListener() {
-						public void onClick(DialogInterface dialog,int id) {
-							
-						}
-					  })
-					.create()
-					.show();
-			//Toast.makeText(activity, text, Toast.LENGTH_LONG).show();
-		}
-		else
-		{*/
-			String username = PreferenceManager.getDefaultSharedPreferences(activity.getApplicationContext()).getString("edt_username", "");
-			String password = PreferenceManager.getDefaultSharedPreferences(activity.getApplicationContext()).getString("edt_password", "");
-			
-			if(username != null) {
-				_Reader = new OwnCloud_Reader();
-				((OwnCloud_Reader)_Reader).Start_AsyncTask_GetVersion(Constants.TaskID_GetVersion, activity, onAsyncTaskGetVersionFinished, username, password);		
-			
-				Toast.makeText(activity, activity.getString(R.string.toast_GettingMoreItems), Toast.LENGTH_SHORT).show();
-			}	
-		//}
-	}
-	
-	static OnAsyncTaskCompletedListener onAsyncTaskGetVersionFinished = new OnAsyncTaskCompletedListener() {
-		
-		@Override
-		public void onAsyncTaskCompleted(int task_id, Object task_result) {
-			if(_Reader != null) {
-				String appVersion = task_result.toString();					
-				API api = API.GetRightApiForVersion(appVersion, activity);
-				((OwnCloud_Reader) _Reader).setApi(api);
-				
-				NewsReaderDetailFragment ndf = ((NewsReaderDetailFragment) activity.getSupportFragmentManager().findFragmentById(R.id.content_frame));
-				_Reader.Start_AsyncTask_GetOldItems(Constants.TaskID_GetItems, activity, onAsyncTaskComplete, ndf.getIdFeed(), ndf.getIdFolder());
-			}
-		}
-	};
-	
-	static OnAsyncTaskCompletedListener onAsyncTaskComplete = new OnAsyncTaskCompletedListener() {
-		@Override
-		public void onAsyncTaskCompleted(int task_id, Object task_result) {			
-			NewsReaderDetailFragment ndf = ((NewsReaderDetailFragment) activity.getSupportFragmentManager().findFragmentById(R.id.content_frame));
-			if(ndf != null)
-				ndf.UpdateCursor();
-			
-			Log.d(TAG, "Finished Download extra items..");
-		}
-	};
-}
\ No newline at end of file
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/model/AudioPodcastItem.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/model/AudioPodcastItem.java
deleted file mode 100644
index 7b796faa..00000000
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/model/AudioPodcastItem.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.luhmer.owncloudnewsreader.model;
-
-/**
- * Created by David on 21.06.2014.
- */
-public class AudioPodcastItem {
-
-    public String itemId;
-    public String title;
-    public String link;
-    public String mimeType;
-}
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/model/PodcastItem.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/model/PodcastItem.java
new file mode 100644
index 00000000..7fb53e4e
--- /dev/null
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/model/PodcastItem.java
@@ -0,0 +1,19 @@
+package de.luhmer.owncloudnewsreader.model;
+
+import java.io.Serializable;
+
+/**
+ * Created by David on 21.06.2014.
+ */
+public class PodcastItem implements Serializable {
+
+    public String itemId;
+    public String title;
+    public String link;
+    public String mimeType;
+
+    public int downloadProgress;
+
+    public static int DOWNLOAD_COMPLETED = -1;
+    public static int DOWNLOAD_NOT_STARTED = -2;
+}
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/AudioPodcastService.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/PodcastPlaybackService.java
index 9fe56b8a..7a656ba2 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/AudioPodcastService.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/PodcastPlaybackService.java
@@ -5,17 +5,19 @@ import android.content.Intent;
 import android.media.MediaPlayer;
 import android.os.Handler;
 import android.os.IBinder;
+import android.view.SurfaceHolder;
 
 import java.io.IOException;
 
 import de.greenrobot.event.EventBus;
 import de.luhmer.owncloudnewsreader.events.podcast.OpenAudioPodcastEvent;
+import de.luhmer.owncloudnewsreader.events.podcast.RegisterVideoOutput;
 import de.luhmer.owncloudnewsreader.events.podcast.TogglePlayerStateEvent;
 import de.luhmer.owncloudnewsreader.events.podcast.UpdatePodcastStatusEvent;
 import de.luhmer.owncloudnewsreader.events.podcast.WindPodcast;
 import de.luhmer.owncloudnewsreader.view.PodcastNotification;
 
-public class AudioPodcastService extends Service {
+public class PodcastPlaybackService extends Service {
 
     PodcastNotification podcastNotification;
 
@@ -26,17 +28,27 @@ public class AudioPodcastService extends Service {
         super.onCreate();
     }
 
-    public AudioPodcastService() {
+    public PodcastPlaybackService() {
         mediaPlayer = new MediaPlayer();
         mHandler = new Handler();
         eventBus = EventBus.getDefault();
 
         eventBus.register(this);
 
+
+
+        mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+            @Override
+            public void onPrepared(MediaPlayer mediaPlayer) {
+                play();
+                isPreparing = false;
+            }
+        });
+
         mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
             @Override
             public void onCompletion(MediaPlayer mediaPlayer) {
-                mHandler.removeCallbacks(mUpdateTimeTask);
+                pause();//Send the over signal
             }
         });
 
@@ -44,6 +56,7 @@ public class AudioPodcastService extends Service {
         //openFile("/sdcard/Music/#Musik/Finest Tunes/Netsky - Running Low (Ft. Beth Ditto).mp3");
     }
 
+
     @Override
     public IBinder onBind(Intent intent) {
         // TODO: Return the communication channel to the service.
@@ -73,22 +86,6 @@ public class AudioPodcastService extends Service {
             mediaPlayer.reset();
             mediaPlayer.setDataSource(pathToFile);
             mediaPlayer.prepareAsync();
-
-            mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
-                @Override
-                public void onPrepared(MediaPlayer mediaPlayer) {
-                    play();
-                    isPreparing = false;
-                }
-            });
-
-            mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
-                @Override
-                public void onCompletion(MediaPlayer mediaPlayer) {
-                    pause();//Send the over signal
-                }
-            });
-
         } catch (IOException e) {
             e.printStackTrace();
             isPreparing = false;
@@ -126,6 +123,13 @@ public class AudioPodcastService extends Service {
         openFile(event.pathToFile, event.mediaTitle);
     }
 
+    public void onEvent(RegisterVideoOutput videoOutput) {
+        if(mediaPlayer != null) {
+            //getHolder().addCallback(videoOutput);
+            videoOutput.surfaceView.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+        }
+    }
+
 
 
 
@@ -137,7 +141,9 @@ public class AudioPodcastService extends Service {
     }
 
     public void pause() {
-        mediaPlayer.pause();
+        if(mediaPlayer.isPlaying())
+            mediaPlayer.pause();
+
         mHandler.removeCallbacks(mUpdateTimeTask);
 
         sendMediaStatus();
@@ -167,4 +173,45 @@ public class AudioPodcastService extends Service {
         eventBus.post(audioPodcastEvent);
     }
 
+
+
+
+    SurfaceHolder.Callback mSHCallback = new SurfaceHolder.Callback()
+    {
+        public void surfaceChanged(SurfaceHolder holder, int format,
+                                   int w, int h)
+        {
+            mSurfaceWidth = w;
+            mSurfaceHeight = h;
+            if (mIsPrepared && mVideoWidth == w && mVideoHeight == h) {
+                if (mSeekWhenPrepared != 0) {
+                    mMediaPlayer.seekTo(mSeekWhenPrepared);
+                }
+                mMediaPlayer.start();
+                if (mMediaController != null) {
+                    mMediaController.show();
+                }
+            }
+        }
+
+        public void surfaceCreated(SurfaceHolder holder)
+        {
+            mSurfaceHolder = holder;
+            openVideo();
+        }
+
+        public void surfaceDestroyed(SurfaceHolder holder)
+        {
+            // after we return from this we can't use the surface any more
+            mSurfaceHolder = null;
+            if (mMediaController != null) mMediaController.hide();
+            if (mMediaPlayer != null) {
+                mMediaPlayer.reset();
+                mMediaPlayer.release();
+                mMediaPlayer = null;
+            }
+        }
+    };
+
+
 }
diff --git a/News-Android-App/src/main/res/values-ach/strings.xml b/News-Android-App/src/main/res/values-ach/strings.xml
deleted file mode 100644
index a7450ea9..00000000
--- a/News-Android-App/src/main/res/values-ach/strings.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--<string name="non_sorted_articles">Nicht zugeordnete Artikel</string>-->
-  <!--Import Accounts-->
-  <!--EMAIL-->
-  <!--Action Bar Items-->
-  <!--Strings related to login-->
-  <!--<string name="pref_title_owncloudRootPath">ownCloud root address</string>-->
-  <!--<string name="pref_default_username">admin</string>-->
-  <!--Toast Messages-->
-  <!--Strings related to Settings-->
-  <!--General settings-->
-  <!--<string-array name="pref_general_sort_order_values">
-        <item>desc</item>
-        <item>asc</item>
-	</string-array>-->
-  <!--<string name="pref_title_social_recommendations">Enable social recommendations</string>
-    <string name="pref_description_social_recommendations">Recommendations for people to contact based on your message history</string>-->
-  <!--<string name="pref_title_AllowAllSSLCertificates">Allow all SSL Certificates</string>-->
-  <!--MemorizingTrustManager-->
-  <!--Podcast-->
-  <!--Settings for Display-->
-  <!--Login Dialog-->
-  <!--Data & Sync-->
-  <!--<string name="pref_title_data_sync_max_items">Max number of items to sync</string>-->
-  <!--<string name="pref_title_sync_frequency">Sync frequency</string>
-
-    <string-array name="pref_sync_frequency_titles">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>3 hours</item>
-        <item>6 hours</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_sync_frequency_values">
-        <item>15</item>
-        <item>30</item>
-        <item>60</item>
-        <item>180</item>
-        <item>360</item>
-        <item>-1</item>
-    </string-array>-->
-  <!--<string name="pref_title_system_sync_settings">System sync settings</string>-->
-  <!--<string name="pref_title_new_message_notifications">New message notifications</string>
-    <string name="pref_title_ringtone">Ringtone</string>
-    <string name="pref_ringtone_silent">Silent</string>
-    <string name="pref_title_vibrate">Vibrate</string>-->
-</resources>
diff --git a/News-Android-App/src/main/res/values-ady/strings.xml b/News-Android-App/src/main/res/values-ady/strings.xml
deleted file mode 100644
index a7450ea9..00000000
--- a/News-Android-App/src/main/res/values-ady/strings.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--<string name="non_sorted_articles">Nicht zugeordnete Artikel</string>-->
-  <!--Import Accounts-->
-  <!--EMAIL-->
-  <!--Action Bar Items-->
-  <!--Strings related to login-->
-  <!--<string name="pref_title_owncloudRootPath">ownCloud root address</string>-->
-  <!--<string name="pref_default_username">admin</string>-->
-  <!--Toast Messages-->
-  <!--Strings related to Settings-->
-  <!--General settings-->
-  <!--<string-array name="pref_general_sort_order_values">
-        <item>desc</item>
-        <item>asc</item>
-	</string-array>-->
-  <!--<string name="pref_title_social_recommendations">Enable social recommendations</string>
-    <string name="pref_description_social_recommendations">Recommendations for people to contact based on your message history</string>-->
-  <!--<string name="pref_title_AllowAllSSLCertificates">Allow all SSL Certificates</string>-->
-  <!--MemorizingTrustManager-->
-  <!--Podcast-->
-  <!--Settings for Display-->
-  <!--Login Dialog-->
-  <!--Data & Sync-->
-  <!--<string name="pref_title_data_sync_max_items">Max number of items to sync</string>-->
-  <!--<string name="pref_title_sync_frequency">Sync frequency</string>
-
-    <string-array name="pref_sync_frequency_titles">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>3 hours</item>
-        <item>6 hours</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_sync_frequency_values">
-        <item>15</item>
-        <item>30</item>
-        <item>60</item>
-        <item>180</item>
-        <item>360</item>
-        <item>-1</item>
-    </string-array>-->
-  <!--<string name="pref_title_system_sync_settings">System sync settings</string>-->
-  <!--<string name="pref_title_new_message_notifications">New message notifications</string>
-    <string name="pref_title_ringtone">Ringtone</string>
-    <string name="pref_ringtone_silent">Silent</string>
-    <string name="pref_title_vibrate">Vibrate</string>-->
-</resources>
diff --git a/News-Android-App/src/main/res/values-ast/strings.xml b/News-Android-App/src/main/res/values-ast/strings.xml
deleted file mode 100644
index 700da047..00000000
--- a/News-Android-App/src/main/res/values-ast/strings.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="auto_sync_string">Autosincronizar</string>
-  <string name="app_name">Llector de noticies ownCloud</string>
-  <string name="title_activity_sync_interval_selector">Seleutor d\'intervalu de sincronizaciones</string>
-  <string name="title_activity_news_detail">ActividáDetallesNoticies</string>
-  <string name="title_activity_subscription">ActividáSoscripción</string>
-  <string name="title_newsreader_list">Llector de noticies</string>
-  <string name="title_newsreader_detail">Detalle del Llector de noticies</string>
-  <string name="empty_view_header">Información</string>
-  <string name="empty_view_content">Nun hai nengún elementu equí</string>
-  <string name="toast_GettingMoreItems">Descarga d\'artículos aniciada.. Por favor espera.</string>
-  <string name="tv_clickHereToOpenItem">Clic equí p\'abrir l\'artículu</string>
-  <string name="no_wifi_available">Nun hai conexón WiFi</string>
-  <string name="do_you_want_to_download_without_wifi">¿Quies baxar les semeyes ensin una conexón WiFi?</string>
-  <string name="max_items_count_reached">Algamesti\'l tamañu máximu de XX elementos</string>
-  <string name="widget_header">Noticies ownCloud</string>
-  <string name="message_bar_new_articles_available">Elementos nuevos disponibles</string>
-  <string name="message_bar_reload">Recargar</string>
-  <string name="allUnreadFeeds">Tolos temes ensin lleer</string>
-  <string name="starredFeeds">Artículos destacaos</string>
-  <string name="title_activity_new_feed">Amestar feed nuevu</string>
-  <!--<string name="non_sorted_articles">Nicht zugeordnete Artikel</string>-->
-  <string name="menu_update">Refrescar</string>
-  <string name="menu_About_Changelog">Tocante a / Rexistru cambeos</string>
-  <string name="menu_markAllAsRead">Conseñar too como lleío</string>
-  <string name="menu_StartImageCaching">Baxar imáxenes</string>
-  <string name="menu_downloadMoreItems">Baxar más oxetos</string>
-  <!--Import Accounts-->
-  <string name="import_account_dialog_title">Importar Cuenta</string>
-  <!--EMAIL-->
-  <string name="email_sourceCode">Códigu fonte del artículu - Bugreport</string>
-  <string name="email_sendMail">Unviar corréu</string>
-  <!--Action Bar Items-->
-  <string name="action_starred">Favoritos</string>
-  <string name="action_read">Lleer</string>
-  <string name="action_openInBrowser">Abrir nel restolador</string>
-  <string name="action_sendSourceCode">Unviar oxetu al desendolcador</string>
-  <string name="action_Share">Compartir</string>
-  <string name="action_login">Axustes del sirvidor</string>
-  <string name="action_save">Guardar</string>
-  <string name="action_settings">Axustes</string>
-  <string name="action_sync_settings">Axustes de sincronización</string>
-  <string name="action_add_new_feed">Amestar feed nuevu</string>
-  <string name="notification_new_items_ticker">Tienes X elementos nuevos ensin lleer</string>
-  <string name="notification_new_items_text">X elementos nuevos ensin lleer disponibles </string>
-  <!--Strings related to login-->
-  <string name="pref_title_username">Nome d\'usuariu</string>
-  <string name="pref_title_password">Contraseña</string>
-  <!--<string name="pref_title_owncloudRootPath">ownCloud root address</string>-->
-  <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
-  <!--<string name="pref_default_username">admin</string>-->
-  <string name="action_sign_in_short">Aniciar sesión</string>
-  <string name="login_progress_signing_in">Aniciando sesión...</string>
-  <string name="error_incorrect_password">Esta contraseña ye incorreuta</string>
-  <string name="error_field_required">Requierse esti campu</string>
-  <string name="error_invalid_url">La url ye incorreuta</string>
-  <!--Toast Messages-->
-  <string name="toast_downloaded_x_items">Downloaded X old items</string>
-  <string name="toast_no_more_downloads_available">Nun hai elementos disponibles</string>
-  <string name="pull_to_refresh_updateTags">Sincronizando l\'estáu de los elementos</string>
-  <string name="pull_to_refresh_updateFolder">Sincronizando carpeta</string>
-  <string name="pull_to_refresh_updateFeeds">Sincronizando feeds</string>
-  <string name="pull_to_refresh_updateItems">Sincronizando oxetos</string>
-  <!--Strings related to Settings-->
-  <string name="title_activity_settings">Axustes</string>
-  <!--General settings-->
-  <string name="pref_header_general">Xeneral</string>
-  <string name="pref_title_general_sort_order">Ordenar</string>
-  <string-array name="pref_general_sort_order">
-    <item>Nuevu -&gt; Vieyu</item>
-    <item>Vieyu -&gt; Nuevu</item>
-  </string-array>
-  <string-array name="pref_general_sort_order_values_not_translated">
-    <item>1</item>
-    <item>0</item>
-  </string-array>
-  <!--<string-array name="pref_general_sort_order_values">
-        <item>desc</item>
-        <item>asc</item>
-	</string-array>-->
-  <!--<string name="pref_title_social_recommendations">Enable social recommendations</string>
-    <string name="pref_description_social_recommendations">Recommendations for people to contact based on your message history</string>-->
-  <string name="dialog_clearing_cache">Llimpiando caché</string>
-  <string name="dialog_clearing_cache_please_wait">Llimpiando caché.. espera.</string>
-  <string name="calculating_cache_size">Calculando tamañu cache.. Espera.</string>
-  <string name="reset_cache_unsaved_changes">Hai cambeos non sincronizaos. ¿Quies vaciar la caché de toes formes?</string>
-  <string name="warning">Avisu</string>
-  <string name="pref_title_AutoSyncOnStart">Sincronizar nel aniciu</string>
-  <string name="pref_title_ShowOnlyUnread">Amosar namái los artículos ensin lleer</string>
-  <!--<string name="pref_title_AllowAllSSLCertificates">Allow all SSL Certificates</string>-->
-  <string name="pref_title_DisableHostnameVerification">Deshabilitar verificación de nome d\'agospiu</string>
-  <string name="pref_title_NavigateWithVolumeButtons">Navegar colos botones de volume</string>
-  <string name="pref_title_MarkAsReadWhileScrolling">Marcar como lleíu al desplazar</string>
-  <string name="pref_title_OpenInBrowserDirectly">Salir de la vista de detalle y abrir l\'artículu nel esplorador</string>
-  <string name="pref_title_notification_new_articles_available">Amosar notificación cuando tean disponibles artículos nuevos</string>
-  <!--MemorizingTrustManager-->
-  <string name="mtm_accept_cert">¿Aceutar certificáu desconocíu?</string>
-  <string name="mtm_decision_always">Siempres</string>
-  <string name="mtm_decision_once">Una vegada</string>
-  <string name="mtm_decision_abort">Albortar</string>
-  <string name="mtm_notification">Verificación del certificáu</string>
-  <!--Podcast-->
-  <!--Settings for Display-->
-  <string name="pref_header_display">Amosar</string>
-  <string name="pref_title_app_theme">Tema de l\'aplicación (necesita reaniciar)</string>
-  <string name="pref_title_feed_list_layout">Llista de fontes</string>
-  <string name="pref_display_font_layout">Fonte (requier reaniciar p\'aplicar)</string>
-  <string-array name="pref_display_apptheme">
-    <item>Escuru</item>
-    <item>Claru</item>
-  </string-array>
-  <string-array name="pref_display_apptheme_values">
-    <item>0</item>
-    <item>1</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout">
-    <item>Cenciellu</item>
-    <item>Estendíu</item>
-    <item>Estendíu con Webview</item>
-  </string-array>
-  <string-array name="pref_display_feed_list_layout_values">
-    <item>0</item>
-    <item>1</item>
-    <item>2</item>
-  </string-array>
-  <string-array name="pref_display_font">
-    <item>Roboto Thin</item>
-    <item>Roboto Light</item>
-    <item>Roboto Regular</item>
-    <item>Roboto Medium</item>
-    <item>Roboto Bold</item>
-    <item>Roboto Black</item>
-    <item>Roboto Condensed</item>
-    <item>Roboto Condensed Bold</item>
-    <item>Roboto Slab Thin</item>
-    <item>Roboto Slab Light</item>
-    <item>Roboto Slab Regular</item>
-    <item>Roboto Slab Bold</item>
-  </string-array>
-  <string-array name="pref_display_font_values">
-    <item>0</item>
-    <item>2</item>
-    <item>4</item>
-    <item>6</item>
-    <item>8</item>
-    <item>10</item>
-    <item>12</item>
-    <item>14</item>
-    <item>16</item>
-    <item>17</item>
-    <item>18</item>
-    <item>19</item>
-  </string-array>
-  <!--Login Dialog-->
-  <string name="login_dialog_title_error">Fallu</string>
-  <string name="login_dialog_text_something_went_wrong">Daqué foi mal :(</string>
-  <string name="login_dialog_text_not_compatible">Esta versión de App nun ye compatible cola to App de Noticies ownCloud. Por favor anueva la app de Noticies y el appframework.</string>
-  <string name="login_dialog_title_security_warning">Avisu de seguridá</string>
-  <string name="login_dialog_text_security_warning">Nun tas usando https. Un atacante pue interceutar el to tráficu y consiguir accesu a dalgunos datos sensibles (exem. la to contraseña). ¡Asina qu\'aconseyámoste usar https!</string>
-  <!--Data & Sync-->
-  <string name="pref_header_data_sync">Datos &amp; sincronización</string>
-  <!--<string name="pref_title_data_sync_max_items">Max number of items to sync</string>-->
-  <string name="pref_title_clearCache">Llimpiar caché</string>
-  <string name="pref_title_CacheImagesOffline">Cachear imáxenes offline</string>
-  <string name="pref_title_Max_Cache_Size">Tamañu máx caché.</string>
-  <string-array name="pref_data_sync_max_cache_size">
-    <item>250 MB</item>
-    <item>500 MB</item>
-    <item>750 MB</item>
-    <item>1 GB</item>
-    <item>2 GB</item>
-    <item>5 GB</item>
-    <item>10 GB</item>
-  </string-array>
-  <string-array name="pref_data_sync_max_cache_size_values">
-    <item>250</item>
-    <item>500</item>
-    <item>750</item>
-    <item>1000</item>
-    <item>2000</item>
-    <item>5000</item>
-    <item>10000</item>
-  </string-array>
-  <string-array name="array_sync_interval">
-    <item>5 Minutos</item>
-    <item>15 Minutos</item>
-    <item>30 Minutos</item>
-    <item>45 Minutos</item>
-    <item>1 Hores</item>
-    <item>2 Hores</item>
-    <item>3 Hores</item>
-    <item>6 Hores</item>
-    <item>12 Hores</item>
-    <item>24 Hores</item>
-  </string-array>
-  <string-array name="array_sync_interval_values">
-    <item>5</item>
-    <item>15</item>
-    <item>30</item>
-    <item>45</item>
-    <item>60</item>
-    <item>120</item>
-    <item>180</item>
-    <item>360</item>
-    <item>720</item>
-    <item>1440</item>
-  </string-array>
-  <!--<string name="pref_title_sync_frequency">Sync frequency</string>
-
-    <string-array name="pref_sync_frequency_titles">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>3 hours</item>
-        <item>6 hours</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_sync_frequency_values">
-        <item>15</item>
-        <item>30</item>
-        <item>60</item>
-        <item>180</item>
-        <item>360</item>
-        <item>-1</item>
-    </string-array>-->
-  <!--<string name="pref_title_system_sync_settings">System sync settings</string>-->
-  <string name="pref_header_notifications">Notificaciones</string>
-  <!--<string name="pref_title_new_message_notifications">New message notifications</string>
-    <string name="pref_title_ringtone">Ringtone</string>
-    <string name="pref_ringtone_silent">Silent</string>
-    <string name="pref_title_vibrate">Vibrate</string>-->
-</resources>
diff --git a/News-Android-App/src/main/res/values-en@pirate/strings.xml b/News-Android-App/src/main/res/values-en@pirate/strings.xml
deleted file mode 100644
index 45dd1413..00000000
--- a/News-Android-App/src/main/res/values-en@pirate/strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--<string name="non_sorted_articles">Nicht zugeordnete Artikel</string>-->
-  <!--Import Accounts-->
-  <!--EMAIL-->
-  <!--Action Bar Items-->
-  <!--Strings related to login-->
-  <string name="pref_title_password">Secret Code</string>
-  <!--<string name="pref_title_owncloudRootPath">ownCloud root address</string>-->
-  <!--<string name="pref_default_username">admin</string>-->
-  <!--Toast Messages-->
-  <!--Strings related to Settings-->
-  <!--General settings-->
-  <!--<string-array name="pref_general_sort_order_values">
-        <item>desc</item>
-        <item>asc</item>
-	</string-array>-->
-  <!--<string name="pref_title_social_recommendations">Enable social recommendations</string>
-    <string name="pref_description_social_recommendations">Recommendations for people to contact based on your message history</string>-->
-  <!--<string name="pref_title_AllowAllSSLCertificates">Allow all SSL Certificates</string>-->
-  <!--MemorizingTrustManager-->
-  <!--Podcast-->
-  <!--Settings for Display-->
-  <!--Login Dialog-->
-  <!--Data & Sync-->
-  <!--<string name="pref_title_data_sync_max_items">Max number of items to sync</string>-->
-  <!--<string name="pref_title_sync_frequency">Sync frequency</string>
-
-    <string-array name="pref_sync_frequency_titles">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>3 hours</item>
-        <item>6 hours</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_sync_frequency_values">
-        <item>15</item>
-        <item>30</item>
-        <item>60</item>
-        <item>180</item>
-        <item>360</item>
-        <item>-1</item>
-    </string-array>-->
-  <!--<string name="pref_title_system_sync_settings">System sync settings</string>-->
-  <!--<string name="pref_title_new_message_notifications">New message notifications</string>
-    <string name="pref_title_ringtone">Ringtone</string>
-    <string name="pref_ringtone_silent">Silent</string>
-    <string name="pref_title_vibrate">Vibrate</string>-->
-</resources>
diff --git a/News-Android-App/src/main/res/values-nds/strings.xml b/News-Android-App/src/main/res/values-nds/strings.xml
deleted file mode 100644
index a7450ea9..00000000
--- a/News-Android-App/src/main/res/values-nds/strings.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--<string name="non_sorted_articles">Nicht zugeordnete Artikel</string>-->
-  <!--Import Accounts-->
-  <!--EMAIL-->
-  <!--Action Bar Items-->
-  <!--Strings related to login-->
-  <!--<string name="pref_title_owncloudRootPath">ownCloud root address</string>-->
-  <!--<string name="pref_default_username">admin</string>-->
-  <!--Toast Messages-->
-  <!--Strings related to Settings-->
-  <!--General settings-->
-  <!--<string-array name="pref_general_sort_order_values">
-        <item>desc</item>
-        <item>asc</item>
-	</string-array>-->
-  <!--<string name="pref_title_social_recommendations">Enable social recommendations</string>
-    <string name="pref_description_social_recommendations">Recommendations for people to contact based on your message history</string>-->
-  <!--<string name="pref_title_AllowAllSSLCertificates">Allow all SSL Certificates</string>-->
-  <!--MemorizingTrustManager-->
-  <!--Podcast-->
-  <!--Settings for Display-->
-  <!--Login Dialog-->
-  <!--Data & Sync-->
-  <!--<string name="pref_title_data_sync_max_items">Max number of items to sync</string>-->
-  <!--<string name="pref_title_sync_frequency">Sync frequency</string>
-
-    <string-array name="pref_sync_frequency_titles">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>3 hours</item>
-        <item>6 hours</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_sync_frequency_values">
-        <item>15</item>
-        <item>30</item>
-        <item>60</item>
-        <item>180</item>
-        <item>360</item>
-        <item>-1</item>
-    </string-array>-->
-  <!--<string name="pref_title_system_sync_settings">System sync settings</string>-->
-  <!--<string name="pref_title_new_message_notifications">New message notifications</string>
-    <string name="pref_title_ringtone">Ringtone</string>
-    <string name="pref_ringtone_silent">Silent</string>
-    <string name="pref_title_vibrate">Vibrate</string>-->
-</resources>
diff --git a/News-Android-App/src/main/res/values-nqo/strings.xml b/News-Android-App/src/main/res/values-nqo/strings.xml
deleted file mode 100644
index a7450ea9..00000000
--- a/News-Android-App/src/main/res/values-nqo/strings.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--<string name="non_sorted_articles">Nicht zugeordnete Artikel</string>-->
-  <!--Import Accounts-->
-  <!--EMAIL-->
-  <!--Action Bar Items-->
-  <!--Strings related to login-->
-  <!--<string name="pref_title_owncloudRootPath">ownCloud root address</string>-->
-  <!--<string name="pref_default_username">admin</string>-->
-  <!--Toast Messages-->
-  <!--Strings related to Settings-->
-  <!--General settings-->
-  <!--<string-array name="pref_general_sort_order_values">
-        <item>desc</item>
-        <item>asc</item>
-	</string-array>-->
-  <!--<string name="pref_title_social_recommendations">Enable social recommendations</string>
-    <string name="pref_description_social_recommendations">Recommendations for people to contact based on your message history</string>-->
-  <!--<string name="pref_title_AllowAllSSLCertificates">Allow all SSL Certificates</string>-->
-  <!--MemorizingTrustManager-->
-  <!--Podcast-->
-  <!--Settings for Display-->
-  <!--Login Dialog-->
-  <!--Data & Sync-->
-  <!--<string name="pref_title_data_sync_max_items">Max number of items to sync</string>-->
-  <!--<string name="pref_title_sync_frequency">Sync frequency</string>
-
-    <string-array name="pref_sync_frequency_titles">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>3 hours</item>
-        <item>6 hours</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_sync_frequency_values">
-        <item>15</item>
-        <item>30</item>
-        <item>60</item>
-        <item>180</item>
-        <item>360</item>
-        <item>-1</item>
-    </string-array>-->
-  <!--<string name="pref_title_system_sync_settings">System sync settings</string>-->
-  <!--<string name="pref_title_new_message_notifications">New message notifications</string>
-    <string name="pref_title_ringtone">Ringtone</string>
-    <string name="pref_ringtone_silent">Silent</string>
-    <string name="pref_title_vibrate">Vibrate</string>-->
-</resources>
diff --git a/News-Android-App/src/main/res/values-tzm/strings.xml b/News-Android-App/src/main/res/values-tzm/strings.xml
deleted file mode 100644
index a7450ea9..00000000
--- a/News-Android-App/src/main/res/values-tzm/strings.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--<string name="non_sorted_articles">Nicht zugeordnete Artikel</string>-->
-  <!--Import Accounts-->
-  <!--EMAIL-->
-  <!--Action Bar Items-->
-  <!--Strings related to login-->
-  <!--<string name="pref_title_owncloudRootPath">ownCloud root address</string>-->
-  <!--<string name="pref_default_username">admin</string>-->
-  <!--Toast Messages-->
-  <!--Strings related to Settings-->
-  <!--General settings-->
-  <!--<string-array name="pref_general_sort_order_values">
-        <item>desc</item>
-        <item>asc</item>
-	</string-array>-->
-  <!--<string name="pref_title_social_recommendations">Enable social recommendations</string>
-    <string name="pref_description_social_recommendations">Recommendations for people to contact based on your message history</string>-->
-  <!--<string name="pref_title_AllowAllSSLCertificates">Allow all SSL Certificates</string>-->
-  <!--MemorizingTrustManager-->
-  <!--Podcast-->
-  <!--Settings for Display-->
-  <!--Login Dialog-->
-  <!--Data & Sync-->
-  <!--<string name="pref_title_data_sync_max_items">Max number of items to sync</string>-->
-  <!--<string name="pref_title_sync_frequency">Sync frequency</string>
-
-    <string-array name="pref_sync_frequency_titles">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>3 hours</item>
-        <item>6 hours</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_sync_frequency_values">
-        <item>15</item>
-        <item>30</item>
-        <item>60</item>
-        <item>180</item>
-        <item>360</item>
-        <item>-1</item>
-    </string-array>-->
-  <!--<string name="pref_title_system_sync_settings">System sync settings</string>-->
-  <!--<string name="pref_title_new_message_notifications">New message notifications</string>
-    <string name="pref_title_ringtone">Ringtone</string>
-    <string name="pref_ringtone_silent">Silent</string>
-    <string name="pref_title_vibrate">Vibrate</string>-->
-</resources>