X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/930d21dc938d37fb4d4bb7baaa7ae26dc445c683..5f2820355d53973f8c577516533fca069464a58b:/src/com/owncloud/android/ui/activity/PassCodeActivity.java

diff --git a/src/com/owncloud/android/ui/activity/PassCodeActivity.java b/src/com/owncloud/android/ui/activity/PassCodeActivity.java
index cc524b41..de5ca8ad 100644
--- a/src/com/owncloud/android/ui/activity/PassCodeActivity.java
+++ b/src/com/owncloud/android/ui/activity/PassCodeActivity.java
@@ -27,6 +27,8 @@ import java.util.Arrays;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
@@ -37,13 +39,11 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.utils.DisplayUtils;
 
-public class PassCodeActivity extends SherlockFragmentActivity {
+public class PassCodeActivity extends AppCompatActivity {
 
 
     private static final String TAG = PassCodeActivity.class.getSimpleName();
@@ -175,12 +175,8 @@ public class PassCodeActivity extends SherlockFragmentActivity {
             public void onFocusChange(View v, boolean hasFocus) {
                 /// TODO WIP: should take advantage of hasFocus to reduce processing
                 if (mPassCodeEditTexts[0].getText().toString().equals("")) {    // TODO WIP validation could be done in a global way, with a single OnFocusChangeListener for all the input fields
-                    //mPassCodeEditTexts[1].setSelected(false);
                     mPassCodeEditTexts[0].requestFocus();
-                    //mPassCodeEditTexts[0].setSelected(true);   // TODO WIP really needed? is it for the colour highlight
-                    //mPassCodeEditTexts[0].setSelection(0);     // TODO WIP what is THIS for?
                 }
-
             }
         });
         
@@ -214,17 +210,10 @@ public class PassCodeActivity extends SherlockFragmentActivity {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 if (mPassCodeEditTexts[0].getText().toString().equals("")) {
-                    //mPassCodeEditTexts[2].setSelected(false);
                     mPassCodeEditTexts[0].requestFocus();
-                    //mPassCodeEditTexts[0].setSelected(true);
-                    //mPassCodeEditTexts[0].setSelection(0);
                 } else if (mPassCodeEditTexts[1].getText().toString().equals("")) {
-                    //mPassCodeEditTexts[2].setSelected(false);
                     mPassCodeEditTexts[1].requestFocus();
-                    //mPassCodeEditTexts[1].setSelected(true);
-                    //mPassCodeEditTexts[1].setSelection(0);
                 }
-
             }
         });
 
@@ -258,20 +247,11 @@ public class PassCodeActivity extends SherlockFragmentActivity {
             public void onFocusChange(View v, boolean hasFocus) {
 
                 if (mPassCodeEditTexts[0].getText().toString().equals("")) {
-                    //mPassCodeEditTexts[3].setSelected(false);
                     mPassCodeEditTexts[0].requestFocus();
-                    //mPassCodeEditTexts[0].setSelected(true);
-                    //mPassCodeEditTexts[0].setSelection(0);
                 } else if (mPassCodeEditTexts[1].getText().toString().equals("")) {
-                    //mPassCodeEditTexts[3].setSelected(false);
                     mPassCodeEditTexts[1].requestFocus();
-                    //mPassCodeEditTexts[1].setSelected(true);
-                    //mPassCodeEditTexts[1].setSelection(0);
                 } else if (mPassCodeEditTexts[2].getText().toString().equals("")) {
-                    //mPassCodeEditTexts[3].setSelected(false);
                     mPassCodeEditTexts[2].requestFocus();
-                    //mPassCodeEditTexts[2].setSelected(true);
-                    //mPassCodeEditTexts[2].setSelection(0);
                 }
 
             }
@@ -293,8 +273,7 @@ public class PassCodeActivity extends SherlockFragmentActivity {
                 finish();
 
             }  else {
-                showErrorAndRestart(R.string.common_error, R.string.pass_code_enter_pass_code, View.INVISIBLE);
-                    /// TODO better error message
+                showErrorAndRestart(R.string.pass_code_wrong, R.string.pass_code_enter_pass_code, View.INVISIBLE);
             }
 
         } else if (ACTION_DISABLE.equals(getIntent().getAction())) {
@@ -309,8 +288,7 @@ public class PassCodeActivity extends SherlockFragmentActivity {
                 finish();
 
             } else {
-                showErrorAndRestart(R.string.common_error, R.string.pass_code_enter_pass_code, View.INVISIBLE);
-                    /// TODO better error message
+                showErrorAndRestart(R.string.pass_code_wrong, R.string.pass_code_enter_pass_code, View.INVISIBLE);
             }
 
         } else if (ACTION_ENABLE.equals(getIntent().getAction())) {