Remove Debug settings activity

* remove debug settings activity; logging can now be enabled via adb setprop, since that's the default way of enabling verbose logs in HttpClient's Android flavour and adb is required for viewing the logs anway
* update i18n accordingly

app/lint.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
-    <issue id="ExtraTranslation" severity="warning" />
     <issue id="InvalidPackage" severity="warning" />
     <issue id="MissingTranslation" severity="warning" />
 </lint>

app/src/main/AndroidManifest.xml

@@ -71,9 +71,6 @@
             android:name=".syncadapter.AddAccountActivity"
             android:excludeFromRecents="true" >
         </activity>
-        <activity
-            android:name=".syncadapter.GeneralSettingsActivity" >
-        </activity>
     </application>
 
 </manifest>

app/src/main/java/at/bitfire/davdroid/MainActivity.java

@@ -19,8 +19,8 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
+
 import at.bitfire.davdroid.syncadapter.AddAccountActivity;
-import at.bitfire.davdroid.syncadapter.GeneralSettingsActivity;
 
 public class MainActivity extends Activity {
 
@@ -55,11 +55,6 @@ public class MainActivity extends Activity {
 		startActivity(intent);
 	}
 	
-	public void showDebugSettings(MenuItem item) {
-		Intent intent = new Intent(this, GeneralSettingsActivity.class);
-		startActivity(intent);
-	}
-
 	public void showSyncSettings(MenuItem item) {
 		Intent intent = new Intent(Settings.ACTION_SYNC_SETTINGS);
 		startActivity(intent);
@@ -76,7 +71,7 @@ public class MainActivity extends Activity {
 		try {
 			return "com.android.vending".equals(getPackageManager().getInstallerPackageName("at.bitfire.davdroid"));
 		} catch(IllegalArgumentException e) {
-		}
             return false;
 		}
 	}
+}

app/src/main/java/at/bitfire/davdroid/syncadapter/GeneralSettingsActivity.java

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/gpl.html
- ******************************************************************************/
-package at.bitfire.davdroid.syncadapter;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.preference.PreferenceFragment;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import at.bitfire.davdroid.R;
-
-public class GeneralSettingsActivity extends Activity {
-	final static String URL_REPORT_ISSUE = "https://github.com/bitfireAT/davdroid/blob/master/CONTRIBUTING.md#reporting-issues"; 
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		
-		getFragmentManager().beginTransaction()
-			.replace(android.R.id.content, new GeneralSettingsFragment())
-        	.commit();
-	}
-	
-	public void reportIssue(MenuItem item) {
-		startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(URL_REPORT_ISSUE)));
-	}
-	
-	
-	public static class GeneralSettingsFragment extends PreferenceFragment {
-	    @Override
-	    public void onCreate(Bundle savedInstanceState) {
-	        super.onCreate(savedInstanceState);
-	        
-			getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS);
-	        addPreferencesFromResource(R.xml.general_settings);
-	        
-	        setHasOptionsMenu(true);
-	    }
-		
-		@Override
-		public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-			inflater.inflate(R.menu.debug_settings, menu);
-		}
-	}
-}

app/src/main/res/menu/debug_settings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:title="@string/settings_report_an_issue" android:showAsAction="always|withText" android:onClick="reportIssue" android:icon="@drawable/ic_action_new_event"></item>
-</menu>

app/src/main/res/menu/main_activity.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:onClick="addAccount" android:title="@string/setup_add_account" android:showAsAction="always" android:icon="@drawable/ic_action_new_account"></item>
+    <item android:onClick="addAccount" android:title="@string/setup_add_account" android:showAsAction="always" android:icon="@drawable/ic_action_new_account"/>
-    <item android:onClick="showSyncSettings" android:title="@string/main_manage_accounts" android:showAsAction="always" android:icon="@drawable/show_sync_settings"></item>
+    <item android:onClick="showSyncSettings" android:title="@string/main_manage_accounts" android:showAsAction="always" android:icon="@drawable/show_sync_settings"/>
-    <item android:onClick="showWebsite" android:title="@string/davdroid_website" android:showAsAction="ifRoom" android:icon="@drawable/view_website"></item>
+    <item android:onClick="showWebsite" android:title="@string/davdroid_website" android:showAsAction="ifRoom" android:icon="@drawable/view_website"/>
-    <item android:showAsAction="never" android:title="@string/settings_debug" android:onClick="showDebugSettings"></item>
 </menu>

app/src/main/res/values-ca/strings.xml

@@ -127,16 +127,4 @@
     <string name="setup_account_name_info">"Podeu fer servir la vostra addreça de correu electrònic com a nom de la compta ja que el Android utiltizar el nom de la compta com a camp ORGANITZADOR pels events que vosaltres creeu. No podeu tenir dos comptes amb el mateix nom.</string>
     <string name="setup_read_only">només-lectura</string>
 
-    <!-- account settings -->
-    <string name="settings_general">Configuració general</string>
-    <string name="settings_debug">Configuració deputarció</string>
-    <string name="settings_disable_http_compression">Desactiva compressió HTTP</string>
-    <string name="settings_http_compression_disabled">La compressió HTTP està desactivada (mode depuració)</string>
-    <string name="settings_http_compression_enabled">La compressió HTTP s\'utilitza quan es possible.</string>
-    <string name="settings_network_logging">Registra el tràfic de xarxa</string>
-    <string name="settings_network_logging_enabled">Tot el tràfic de xarxa es reigstra (mode depuració)</string>
-    <string name="settings_network_logging_disabled">No es registra el tràfic de xarxa</string>
-    <string name="settings_report_an_issue">Informa d\'un error</string>
-
-
 </resources>

app/src/main/res/values-cs/strings.xml

@@ -127,15 +127,4 @@
     <string name="setup_account_name_info">"Použijte svou emailovou adresu jako jméno účtu. Android bude používat tuto hodnotu jako jméno ORGANIZÁTORA událostí které vytvoříte. Nelze mít dva účty se stejným jménem.</string>
     <string name="setup_read_only">pouze pro čtení</string>
 
-    <!-- account settings -->
-    <string name="settings_general">Obecná nastavení</string>
-    <string name="settings_debug">Ladící nastavení</string>
-    <string name="settings_disable_http_compression">Vypnout HTTP kompresi</string>
-    <string name="settings_http_compression_disabled">HTTP komprese je vypnuta (ladící mód)</string>
-    <string name="settings_http_compression_enabled">HTTP komprese je použita všude kde možno</string>
-    <string name="settings_network_logging">Logovat síťový provoz</string>
-    <string name="settings_network_logging_enabled">Veškerý síťový provoz je detailně logován (ladící mód)</string>
-    <string name="settings_network_logging_disabled">Síťový provoz není logován</string>
-    <string name="settings_report_an_issue">Nahlásit problém</string>
-    
 </resources>

app/src/main/res/values-de/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <!-- common strings -->
+    <string name="app_name">DAVdroid</string>
     <string name="davdroid_website">DAVdroid-Website</string>
     <string name="next">Weiter</string>
     <string name="help">Hilfe</string>
@@ -122,17 +122,4 @@
     <string name="setup_account_name_info">&quot;Verwenden Sie Ihre Email-Adresse als Kontoname, da Android den Kontonamen als ORGANIZER-Feld in Terminen benutzt. Sie können keine zwei Konten mit dem gleichen Namen anlegen.</string>
     <string name="setup_read_only">schreibgeschützt</string>
 
-    <!-- account settings -->
-	<string name="davdroid_help">Hilfe zu DAVdroid</string>
-    
-    <string name="settings_general">Allgemeine Einstellungen</string>
-    <string name="settings_debug">Einstellungen zur Fehlersuche</string>
-    <string name="settings_disable_http_compression">HTTP-Komprimierung deaktivieren</string>
-    <string name="settings_http_compression_disabled">HTTP-Komprimierung ist deaktiviert (zur Fehlersuche)</string>
-    <string name="settings_http_compression_enabled">HTTP-Komprimierung wird verwendet, falls möglich</string>
-    <string name="settings_network_logging">Netzwerkverkehr aufzeichnen</string>
-    <string name="settings_network_logging_enabled">Der gesamte Netzwerkverkehr wird in den Android-Logs mitgeschrieben (zur Fehlersuche)</string>
-    <string name="settings_network_logging_disabled">Netzwerkverkehr wird nicht aufgezeichnet</string>
-    <string name="settings_report_an_issue">Problem berichten</string>
-    
 </resources>

app/src/main/res/values-es/strings.xml

@@ -2,7 +2,6 @@
 <resources>
 
     <string name="app_name">DAVdroid</string>
-    <string name="menu_settings">Ajustes</string>
 
     <string-array name="http_protocols">
         <item>http://</item>
@@ -15,9 +14,8 @@
     <string name="login_base_url">URL raiz (colecciones autodetectadas):</string>
     <string name="next">Siguiente</string>
     <string name="help">Ayuda</string>
-    <string name="login_invalid_base_url">URL base no válida: </string>
     <string name="setup_select_collections">DAVdroid: Selecciona las colecciones</string>
-    <string name="login_exception_io">I/O error: %s</string>
+    <string name="exception_io">I/O error: %s</string>
     <string name="exception_uri_syntax">URI no válida: %s</string>
     <string name="exception_incapable_resource">Se han perdido capacidades: %s</string>
     <string name="setup_neither_caldav_nor_carddav">Ni CalDAV ni CardDAV están disponibles</string>
@@ -31,7 +29,6 @@
     <string name="setup_select_calendars">Selecciona tus calendarios:</string>
     <string name="login_auth_preemptive">Autentificación preferente (recomendado, pero incompatible con la autentificación de Digest)</string>
     
-    <string name="davdroid_help">Ayuda de DAVdroid</string>
     <string name="main_manage_accounts">Administrar las cuentas sincronizadas</string>
     <string name="davdroid_website">Sitio web de DAVdroid</string>
     <string name="html_main_info"><![CDATA[

app/src/main/res/values-fr/strings.xml

@@ -2,7 +2,6 @@
 <resources>
 
     <string name="app_name">DAVdroid</string>
-    <string name="menu_settings">Paramètres</string>
 
     <string-array name="http_protocols">
         <item>http://</item>
@@ -15,9 +14,8 @@
     <string name="login_base_url">URL racine(les collections seront autodétectées):</string>
     <string name="next">Suivant</string>
     <string name="help">Aide</string>
-    <string name="login_invalid_base_url">Racine de l\'URL incorrecte:</string>
     <string name="setup_select_collections">DAVdroid: Sélectionnez les collections</string>
-    <string name="login_exception_io">Erreur I/O: %s</string>
+    <string name="exception_io">Erreur I/O: %s</string>
     <string name="exception_uri_syntax">URI incorrecte: %s</string>
     <string name="exception_incapable_resource">Capacités manquantes: %s</string>
     <string name="setup_neither_caldav_nor_carddav">Aucun CalDAV ou CardDAV disponible</string>
@@ -31,7 +29,6 @@
     <string name="setup_select_calendars">Choisissez vos agendas:</string>
     <string name="login_auth_preemptive">Authentification préventive(recommandé, mais incompatible avec l\'authentification Digest)</string>
     
-    <string name="davdroid_help">Aide de DAVdroid</string>
     <string name="main_manage_accounts">Gérer les comptes synchronisés</string>
     <string name="davdroid_website">Site Web de DAVdroid</string>
     <string name="html_main_info"><![CDATA[

app/src/main/res/values-hu/strings.xml

@@ -133,15 +133,4 @@
     <string name="setup_account_name_info">"Használja az email címet fióknévként, mert később a létrehozandó események szervezőjeként (ORGANIZER mező) az Android ezt fogja használni. Két fiókot nem lehet azonos néven létrehozni.</string>
     <string name="setup_read_only">csak olvasható</string>
 
-    <!-- account settings -->
-    <string name="settings_general">Általános beállítások</string>
-    <string name="settings_debug">Hibakeresési beállítások</string>
-    <string name="settings_disable_http_compression">HTTP tömörítés kikapcsolása</string>
-    <string name="settings_http_compression_disabled">HTTP tömörítés kikapcsolva (hibakeresés)</string>
-    <string name="settings_http_compression_enabled">HTTP tömörítés bekapcsolva (ahol csak lehetséges)</string>
-    <string name="settings_network_logging">Hálózati forgalom naplózása</string>
-    <string name="settings_network_logging_enabled">A teljes hálózati forgalom részletes naplózása (hibakeresés)</string>
-    <string name="settings_network_logging_disabled">A hálózati forgalom naplózása kikapcsolva</string>
-    <string name="settings_report_an_issue">Probléma bejelentése</string>
-    
 </resources>

app/src/main/res/values-sr/strings.xml

@@ -122,15 +122,4 @@
     <string name="setup_account_name_info">"Користите вашу е-адресу као име налога јер Андроид користи име налога за поље ОРГАНИЗАТОР за догађаје које направите. Не можете имати два налога истог имена.</string>
     <string name="setup_read_only">само-за-читање</string>
 
-    <!-- account settings -->
-    <string name="settings_general">Опште поставке</string>
-    <string name="settings_debug">Поставке проналаска грешака</string>
-    <string name="settings_disable_http_compression">Онемогући ХТТП компресију</string>
-    <string name="settings_http_compression_disabled">ХТТП компресија је онемогућена (режим проналаска грешака)</string>
-    <string name="settings_http_compression_enabled">ХТТП компресија се користи кад год је могуће</string>
-    <string name="settings_network_logging">Бележи мрежни саобраћај</string>
-    <string name="settings_network_logging_enabled">Сав мрежни саобраћај се исцрпно бележи у дневник (режим проналаска грешака)</string>
-    <string name="settings_network_logging_disabled">Мрежни саобраћај се не бележи у дневник</string>
-    <string name="settings_report_an_issue">Пријави грешку</string>
-    
 </resources>

app/src/main/res/values-zh-rcn/strings.xml

@@ -112,15 +112,4 @@
     <string name="setup_account_name_info">"请使用您的 E-mail 地址作为账户名，因为 Android 会将帐户名用于您创建的日程的参与者 (ORGANIZER) 项。您不能有两个重名的账户。</string>
     <string name="setup_read_only">只读</string>
 
-    <!-- account settings -->
-    <string name="settings_general">普通设置</string>
-    <string name="settings_debug">调试设置</string>
-    <string name="settings_disable_http_compression">停用 HTTP 压缩</string>
-    <string name="settings_http_compression_disabled">HTTP 压缩已停用（调试模式）</string>
-    <string name="settings_http_compression_enabled">HTTP 压缩会在可用时使用</string>
-    <string name="settings_network_logging">记录网络传输</string>
-    <string name="settings_network_logging_enabled">传输内容会被日志记录（调试模式）</string>
-    <string name="settings_network_logging_disabled">传输内容不会被日志记录</string>
-    <string name="settings_report_an_issue">报告问题</string>
-    
 </resources>

app/src/main/res/values/strings.xml

@@ -126,15 +126,4 @@
     <string name="setup_account_name_info">"Use your email address as account name because Android will use the account name as ORGANIZER field for events you create. You can't have two accounts with the same name.</string>
     <string name="setup_read_only">read-only</string>
 
-    <!-- account settings -->
-    <string name="settings_general">General settings</string>
-    <string name="settings_debug">Debug settings</string>
-    <string name="settings_disable_http_compression">Disable HTTP compression</string>
-    <string name="settings_http_compression_disabled">HTTP compression is disabled (debug mode)</string>
-    <string name="settings_http_compression_enabled">HTTP compression is used whenever possible</string>
-    <string name="settings_network_logging">Log network traffic</string>
-    <string name="settings_network_logging_enabled">All network traffic is being logged verbosely (debug mode)</string>
-    <string name="settings_network_logging_disabled">Network traffic is not being logged</string>
-    <string name="settings_report_an_issue">Report an issue</string>
-    
 </resources>

app/src/main/res/xml/account_prefs.xml

@@ -8,14 +8,4 @@
             android:action="ACTION_VIEW" />
     </PreferenceScreen>
 
-    
-    <PreferenceCategory android:title="@string/settings_general" />
-    
-    <PreferenceScreen android:title="@string/settings_debug">
-        <intent
-            android:targetPackage="at.bitfire.davdroid"
-            android:targetClass="at.bitfire.davdroid.syncadapter.GeneralSettingsActivity"
-            android:action="ACTION_VIEW" />
-    </PreferenceScreen>
-    
 </PreferenceScreen>

app/src/main/res/xml/general_settings.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <CheckBoxPreference
-        android:key="disable_compression"
-        android:summaryOff="@string/settings_http_compression_enabled"
-        android:summaryOn="@string/settings_http_compression_disabled"
-        android:title="@string/settings_disable_http_compression" />
-    <CheckBoxPreference android:title="@string/settings_network_logging" android:summaryOn="@string/settings_network_logging_enabled" android:key="network_logging" android:summaryOff="@string/settings_network_logging_disabled"/>
-
-</PreferenceScreen>

res/xml/account_prefs.xml

@@ -8,14 +8,4 @@
             android:action="ACTION_VIEW" />
     </PreferenceScreen>
 
-    
-    <PreferenceCategory android:title="@string/settings_general" />
-    
-    <PreferenceScreen android:title="@string/settings_debug">
-        <intent
-            android:targetPackage="at.bitfire.davdroid"
-            android:targetClass="at.bitfire.davdroid.syncadapter.GeneralSettingsActivity"
-            android:action="ACTION_VIEW" />
-    </PreferenceScreen>
-    
 </PreferenceScreen>