Merge branch 'develop' into navigation_drawer

[pub/Android/ownCloud.git] / 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 331ac5f..de5ca8a 100644 (file)
--- 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.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;
 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 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;
 
 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();
 
 
     private static final String TAG = PassCodeActivity.class.getSimpleName();


@@ -174,15 +174,9 @@ public class PassCodeActivity extends SherlockFragmentActivity {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 /// TODO WIP: should take advantage of hasFocus to reduce processing
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 /// TODO WIP: should take advantage of hasFocus to reduce processing

-                mPassCodeEditTexts[1].setCursorVisible(true);      // TODO WIP this could be made static, or just nothing, since default is true

                 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
                 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[1].setCursorVisible(false); // TODO WIP don't think we really need to enable and disable it; fields without focus should not show it

                     mPassCodeEditTexts[0].requestFocus();
                     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?

                 }
                 }

-

             }
         });
         
             }
         });
         


@@ -215,21 +209,11 @@ public class PassCodeActivity extends SherlockFragmentActivity {
 
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
 
             @Override
             public void onFocusChange(View v, boolean hasFocus) {

-                mPassCodeEditTexts[2].setCursorVisible(true);

                 if (mPassCodeEditTexts[0].getText().toString().equals("")) {
                 if (mPassCodeEditTexts[0].getText().toString().equals("")) {

-                    mPassCodeEditTexts[2].setSelected(false);
-                    mPassCodeEditTexts[2].setCursorVisible(false);

                     mPassCodeEditTexts[0].requestFocus();
                     mPassCodeEditTexts[0].requestFocus();

-                    mPassCodeEditTexts[0].setSelected(true);
-                    mPassCodeEditTexts[0].setSelection(0);

                 } else if (mPassCodeEditTexts[1].getText().toString().equals("")) {
                 } else if (mPassCodeEditTexts[1].getText().toString().equals("")) {

-                    mPassCodeEditTexts[2].setSelected(false);
-                    mPassCodeEditTexts[2].setCursorVisible(false);

                     mPassCodeEditTexts[1].requestFocus();
                     mPassCodeEditTexts[1].requestFocus();

-                    mPassCodeEditTexts[1].setSelected(true);
-                    mPassCodeEditTexts[1].setSelection(0);

                 }
                 }

-

             }
         });
 
             }
         });
 


@@ -261,26 +245,13 @@ public class PassCodeActivity extends SherlockFragmentActivity {
 
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
 
             @Override
             public void onFocusChange(View v, boolean hasFocus) {

-                mPassCodeEditTexts[3]. setCursorVisible(true);

 
                 if (mPassCodeEditTexts[0].getText().toString().equals("")) {
 
                 if (mPassCodeEditTexts[0].getText().toString().equals("")) {

-                    mPassCodeEditTexts[3].setSelected(false);
-                    mPassCodeEditTexts[3].setCursorVisible(false);

                     mPassCodeEditTexts[0].requestFocus();
                     mPassCodeEditTexts[0].requestFocus();

-                    mPassCodeEditTexts[0].setSelected(true);
-                    mPassCodeEditTexts[0].setSelection(0);

                 } else if (mPassCodeEditTexts[1].getText().toString().equals("")) {
                 } else if (mPassCodeEditTexts[1].getText().toString().equals("")) {

-                    mPassCodeEditTexts[3].setSelected(false);
-                    mPassCodeEditTexts[3].setCursorVisible(false);

                     mPassCodeEditTexts[1].requestFocus();
                     mPassCodeEditTexts[1].requestFocus();

-                    mPassCodeEditTexts[1].setSelected(true);
-                    mPassCodeEditTexts[1].setSelection(0);

                 } else if (mPassCodeEditTexts[2].getText().toString().equals("")) {
                 } else if (mPassCodeEditTexts[2].getText().toString().equals("")) {

-                    mPassCodeEditTexts[3].setSelected(false);
-                    mPassCodeEditTexts[3].setCursorVisible(false);

                     mPassCodeEditTexts[2].requestFocus();
                     mPassCodeEditTexts[2].requestFocus();

-                    mPassCodeEditTexts[2].setSelected(true);
-                    mPassCodeEditTexts[2].setSelection(0);

                 }
 
             }
                 }
 
             }


@@ -302,8 +273,7 @@ public class PassCodeActivity extends SherlockFragmentActivity {
                 finish();
 
             }  else {
                 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())) {
             }
 
         } else if (ACTION_DISABLE.equals(getIntent().getAction())) {


@@ -318,8 +288,7 @@ public class PassCodeActivity extends SherlockFragmentActivity {
                 finish();
 
             } else {
                 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())) {
             }
 
         } else if (ACTION_ENABLE.equals(getIntent().getAction())) {