Remove some import warnings

diff --git a/res/values/setup.xml b/res/values/setup.xml
index 325e2f1..932612e 100644 (file)
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -11,7 +11,7 @@
     <string name ="default_display_name_for_root_folder">ownCloud</string>
     
     <!-- URLs and flags related -->
     <string name ="default_display_name_for_root_folder">ownCloud</string>
     
     <!-- URLs and flags related -->

-    <string name="server_url">https://test1.owncloud.com/oc6-shib</string>
+    <string name="server_url"></string>

     <bool name="show_server_url_input">true</bool>
     <bool name="show_welcome_link">true</bool>
        <string name="welcome_link_url">"https://owncloud.com/mobile/new"</string>
     <bool name="show_server_url_input">true</bool>
     <bool name="show_welcome_link">true</bool>
        <string name="welcome_link_url">"https://owncloud.com/mobile/new"</string>


@@ -19,7 +19,7 @@
     
     <!-- Flags to setup the authentication methods available in the app -->
     <string name="auth_method_oauth2">off</string>
     
     <!-- Flags to setup the authentication methods available in the app -->
     <string name="auth_method_oauth2">off</string>

-    <string name="auth_method_saml_web_sso">on</string>
+    <string name="auth_method_saml_web_sso">off</string>

     
     <!-- Flags to enable/disable some features -->
     <string name = "send_files_to_other_apps">on</string>
     
     <!-- Flags to enable/disable some features -->
     <string name = "send_files_to_other_apps">on</string>

diff --git a/src/com/owncloud/android/ui/adapter/CertificateCombinedExceptionViewAdapter.java b/src/com/owncloud/android/ui/adapter/CertificateCombinedExceptionViewAdapter.java
index 54fa8aa..b1c3263 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/CertificateCombinedExceptionViewAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/CertificateCombinedExceptionViewAdapter.java
@@ -19,7 +19,6 @@ package com.owncloud.android.ui.adapter;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;

-import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.ErrorViewAdapter;

 
 import android.view.View;
 import android.widget.TextView;
 
 import android.view.View;
 import android.widget.TextView;

diff --git a/src/com/owncloud/android/ui/adapter/SslCertificateViewAdapter.java b/src/com/owncloud/android/ui/adapter/SslCertificateViewAdapter.java
index f470a60..a944ead 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/SslCertificateViewAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/SslCertificateViewAdapter.java
@@ -21,8 +21,6 @@ import java.util.Date;
 
 import com.owncloud.android.R;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 
 import com.owncloud.android.R;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;

-import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.CertificateViewAdapter;
-

 import android.net.http.SslCertificate;
 import android.view.View;
 import android.widget.TextView;
 import android.net.http.SslCertificate;
 import android.view.View;
 import android.widget.TextView;

diff --git a/src/com/owncloud/android/ui/adapter/SslErrorViewAdapter.java b/src/com/owncloud/android/ui/adapter/SslErrorViewAdapter.java
index f0d5b2c..7d2e291 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/SslErrorViewAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/SslErrorViewAdapter.java
@@ -18,8 +18,6 @@ package com.owncloud.android.ui.adapter;
 
 import com.owncloud.android.R;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 
 import com.owncloud.android.R;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;

-import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.ErrorViewAdapter;
-

 import android.net.http.SslError;
 import android.view.View;
 import android.widget.TextView;
 import android.net.http.SslError;
 import android.view.View;
 import android.widget.TextView;

diff --git a/src/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java b/src/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java
index 522f02f..a290dca 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java
@@ -26,7 +26,6 @@ import javax.security.auth.x500.X500Principal;
 
 import com.owncloud.android.R;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 
 import com.owncloud.android.R;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;

-import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.CertificateViewAdapter;

 
 import android.view.View;
 import android.widget.TextView;
 
 import android.view.View;
 import android.widget.TextView;