From 9593b580b72aaec969689eb4ca7197f8da736ab8 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Mon, 4 May 2015 11:41:09 +0200
Subject: [PATCH] Replaced 'PIN code' by 'pass code'

---
 AndroidManifest.xml                                |   2 +-
 res/layout/{pincodelock.xml => passcodelock.xml}   | 156 ++++++++++-----------
 res/values/strings.xml                             |  20 +--
 res/xml/preferences.xml                            |   5 -
 .../android/authentication/PassCodeManager.java    |   9 +-
 ...{PinCodeActivity.java => PassCodeActivity.java} | 142 +++++++++----------
 .../owncloud/android/ui/activity/Preferences.java  |   7 +-
 7 files changed, 165 insertions(+), 176 deletions(-)
 rename res/layout/{pincodelock.xml => passcodelock.xml} (89%)
 rename src/com/owncloud/android/ui/activity/{PinCodeActivity.java => PassCodeActivity.java} (81%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8b9f2146..2d989b1e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -151,7 +151,7 @@
         <service android:name=".files.services.FileUploader" />
         <service android:name=".media.MediaService" />
         
-        <activity android:name=".ui.activity.PinCodeActivity" />
+        <activity android:name=".ui.activity.PassCodeActivity" />
         <activity android:name=".ui.activity.ConflictsResolveActivity"/>
         <activity android:name=".ui.activity.GenericExplanationActivity"/>
         <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>
diff --git a/res/layout/pincodelock.xml b/res/layout/passcodelock.xml
similarity index 89%
rename from res/layout/pincodelock.xml
rename to res/layout/passcodelock.xml
index 8c95c728..7c875723 100644
--- a/res/layout/pincodelock.xml
+++ b/res/layout/passcodelock.xml
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program 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 General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:padding="20dp" >
-
-
-    <TextView
-        android:id="@+id/pinHdr"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/pincode_enter_pin_code"
-        android:textColor="@android:color/black"
-        android:gravity="center_horizontal"
-         />
-
-    <TextView
-        android:id="@+id/pinHdrExpl"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/pincode_configure_your_pin_explanation"
-        android:textAppearance="@android:style/TextAppearance.Small"
-        android:gravity="center_horizontal"
-         />
-    
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal" >
-
-        <EditText
-            android:id="@+id/txt1"
-            android:focusable="true"
-            style="@style/PassCodeStyle"
-            android:cursorVisible="true"
-            ><requestFocus/></EditText>
-
-        <EditText
-            android:id="@+id/txt2"
-            style="@style/PassCodeStyle" />
-
-        <EditText
-            android:id="@+id/txt3"
-            style="@style/PassCodeStyle" />
-
-        <EditText
-            android:id="@+id/txt4"
-            style="@style/PassCodeStyle" />
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/cancel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/common_cancel" />
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2015 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program 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 General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:padding="20dp" >
+
+
+    <TextView
+        android:id="@+id/header"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/pass_code_enter_pass_code"
+        android:textColor="@android:color/black"
+        android:gravity="center_horizontal"
+         />
+
+    <TextView
+        android:id="@+id/explanation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/pass_code_configure_your_pass_code_explanation"
+        android:textAppearance="@android:style/TextAppearance.Small"
+        android:gravity="center_horizontal"
+         />
+    
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal" >
+
+        <EditText
+            android:id="@+id/txt1"
+            android:focusable="true"
+            style="@style/PassCodeStyle"
+            android:cursorVisible="true"
+            ><requestFocus/></EditText>
+
+        <EditText
+            android:id="@+id/txt2"
+            style="@style/PassCodeStyle" />
+
+        <EditText
+            android:id="@+id/txt3"
+            style="@style/PassCodeStyle" />
+
+        <EditText
+            android:id="@+id/txt4"
+            style="@style/PassCodeStyle" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/common_cancel" />
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 71a40b5b..b6502646 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,7 +24,7 @@
     <string name="prefs_category_more">More</string>
     <string name="prefs_accounts">Accounts</string>
     <string name="prefs_manage_accounts">Manage Accounts</string>
-    <string name="prefs_pincode">Passcode lock</string>
+    <string name="prefs_passcode">Pass code lock</string>
     <string name="prefs_instant_upload">Instant picture uploads</string>
     <string name="prefs_instant_upload_summary">Instantly upload pictures taken by camera</string>
     <string name="prefs_instant_video_upload">Instant video uploads</string>
@@ -130,16 +130,16 @@
     <string name="foreign_files_local_text">"Local: %1$s"</string>
     <string name="foreign_files_remote_text">"Remote: %1$s"</string>
     <string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder. Would you like to move them instead? </string>
-    <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
+    <string name="pass_code_enter_pass_code">Please, insert your pass code</string>
     
-    <string name="pincode_configure_your_pin">Enter your App PIN</string>
-    <string name="pincode_configure_your_pin_explanation">The PIN will be requested every time the app is started</string>
-    <string name="pincode_reenter_your_pincode">Please, reenter your App PIN</string>
-    <string name="pincode_remove_your_pincode">Remove your App PIN</string>
-    <string name="pincode_mismatch">The App PINs are not the same</string>
-    <string name="pincode_wrong">Incorrect App PIN</string>
-    <string name="pincode_removed">App PIN removed</string>
-    <string name="pincode_stored">App PIN stored</string>
+    <string name="pass_code_configure_your_pass_code">Enter your pass code</string>
+    <string name="pass_code_configure_your_pass_code_explanation">The pass code will be requested every time the app is started</string>
+    <string name="pass_code_reenter_your_pass_code">Please, reenter your pass code</string>
+    <string name="pass_code_remove_your_pass_code">Remove your pass code</string>
+    <string name="pass_code_mismatch">The pass codes are not the same</string>
+    <string name="pass_code_wrong">Incorrect pass code</string>
+    <string name="pass_code_removed">Pass code removed</string>
+    <string name="pass_code_stored">Pass code stored</string>
     
     <string name="media_notif_ticker">"%1$s music player"</string>
     <string name="media_state_playing">"%1$s (playing)"</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 18cb398f..3154c919 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -22,11 +22,6 @@
     </PreferenceCategory>
     
 	<PreferenceCategory android:title="@string/prefs_category_security">
-	    <!-- ListPreference
-	        android:key="select_oc_account"
-	        android:title="@string/prefs_select_oc_account"
-	        android:summary="@string/prefs_summary_select_oc_account"
-	        / -->
 	    <android.preference.CheckBoxPreference android:title="@string/prefs_pincode" android:key="set_pincode" />
 	</PreferenceCategory>
 
diff --git a/src/com/owncloud/android/authentication/PassCodeManager.java b/src/com/owncloud/android/authentication/PassCodeManager.java
index a49b2ab8..6b89ab6b 100644
--- a/src/com/owncloud/android/authentication/PassCodeManager.java
+++ b/src/com/owncloud/android/authentication/PassCodeManager.java
@@ -6,11 +6,10 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
-import android.view.View;
 import android.view.WindowManager;
 
 import com.owncloud.android.MainApp;
-import com.owncloud.android.ui.activity.PinCodeActivity;
+import com.owncloud.android.ui.activity.PassCodeActivity;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -21,7 +20,7 @@ public class PassCodeManager {
 
     static {
         sExemptOfPasscodeActivites = new HashSet<Class>();
-        sExemptOfPasscodeActivites.add(PinCodeActivity.class);
+        sExemptOfPasscodeActivites.add(PassCodeActivity.class);
         // other activities may be exempted, if needed
     }
 
@@ -55,8 +54,8 @@ public class PassCodeManager {
                 passCodeShouldBeRequested()
                 ){
 
-            Intent i = new Intent(MainApp.getAppContext(), PinCodeActivity.class);
-            i.setAction(PinCodeActivity.ACTION_REQUEST);
+            Intent i = new Intent(MainApp.getAppContext(), PassCodeActivity.class);
+            i.setAction(PassCodeActivity.ACTION_REQUEST);
             i.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
             activity.startActivity(i);
 
diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PassCodeActivity.java
similarity index 81%
rename from src/com/owncloud/android/ui/activity/PinCodeActivity.java
rename to src/com/owncloud/android/ui/activity/PassCodeActivity.java
index 11ddf11d..9da7784d 100644
--- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java
+++ b/src/com/owncloud/android/ui/activity/PassCodeActivity.java
@@ -39,20 +39,19 @@ import android.widget.Toast;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.owncloud.android.R;
-import com.owncloud.android.authentication.PassCodeManager;
 import com.owncloud.android.utils.DisplayUtils;
 
-public class PinCodeActivity extends SherlockFragmentActivity {
+public class PassCodeActivity extends SherlockFragmentActivity {
 
   
-    public final static String ACTION_TOGGLE = PinCodeActivity.class.getCanonicalName() + ".TOGGLE";
-    public final static String ACTION_REQUEST= PinCodeActivity.class.getCanonicalName()  + ".REQUEST";
+    public final static String ACTION_TOGGLE = PassCodeActivity.class.getCanonicalName() + ".TOGGLE";
+    public final static String ACTION_REQUEST= PassCodeActivity.class.getCanonicalName()  + ".REQUEST";
 
-    public final static String EXTRA_NEW_STATE = "com.owncloud.android.ui.activity.PinCodeActivity.NEW_STATE";
+    public final static String EXTRA_NEW_STATE = PassCodeActivity.class.getCanonicalName() + ".NEW_STATE";
     
     private Button mBCancel;
-    private TextView mPinHdr;
-    private TextView mPinHdrExplanation;
+    private TextView mPassCodeHdr;
+    private TextView mPassCodeHdrExplanation;
     private EditText mText1;
     private EditText mText2;
     private EditText mText3;
@@ -60,20 +59,20 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     
     private String [] mTempText ={"","","",""};
     
-    private boolean mConfirmingPinCode = false;
-    private boolean mPinCodeChecked = false;
+    private boolean mConfirmingPassCode = false;
+    private boolean mPassCodeChecked = false;
     private boolean mNewPasswordEntered = false;
     private boolean mBChange = true; // to control that only one blocks jump
-    //private int mTCounter ; // Count the number of attempts an user could introduce the PIN code
+    //private int mTCounter ; // Count the number of attempts an user could introduce the pass code
 
     
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.pincodelock); 
+        setContentView(R.layout.passcodelock);
         
         mBCancel = (Button) findViewById(R.id.cancel);
-        mPinHdr = (TextView) findViewById(R.id.pinHdr);
-        mPinHdrExplanation = (TextView) findViewById(R.id.pinHdrExpl);
+        mPassCodeHdr = (TextView) findViewById(R.id.header);
+        mPassCodeHdrExplanation = (TextView) findViewById(R.id.explanation);
         mText1 = (EditText) findViewById(R.id.txt1);
         mText1.requestFocus();
         getWindow().setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
@@ -85,39 +84,39 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                 .getDefaultSharedPreferences(getApplicationContext());
         
  
-        // Not PIN Code defined yet.
+        // Not Pass Code defined yet.
         // In a previous version settings is allow from start
         if ( (appPrefs.getString("PrefPinCode1", null) == null ) ){
-            setChangePincodeView(true);
-            mPinCodeChecked = true; 
+            setChangePassCodeView(true);
+            mPassCodeChecked = true;
             mNewPasswordEntered = true;
             
         } else {
 
             /// TODO rewrite this activity; this logic is too twisted
             if (appPrefs.getBoolean("set_pincode", false)){
-                // pincode activated
+                // pass code activated
                 if (ACTION_TOGGLE.equals(getIntent().getAction())) {
-                    // PIN has been activated yet
-                    mPinHdr.setText(R.string.pincode_configure_your_pin);
-                    mPinHdrExplanation.setVisibility(View.VISIBLE);
-                    mPinCodeChecked = true ; // No need to check it
-                    setChangePincodeView(true);
+                    // pass code has been activated yet
+                    mPassCodeHdr.setText(R.string.pass_code_configure_your_pass_code);
+                    mPassCodeHdrExplanation.setVisibility(View.VISIBLE);
+                    mPassCodeChecked = true ; // No need to check it
+                    setChangePassCodeView(true);
                } else {
-                    // PIN active
+                    // pass code active
                     mBCancel.setVisibility(View.INVISIBLE);
                     mBCancel.setVisibility(View.GONE);
-                    mPinHdr.setText(R.string.pincode_enter_pin_code);
-                    mPinHdrExplanation.setVisibility(View.INVISIBLE);
-                    setChangePincodeView(false);
+                    mPassCodeHdr.setText(R.string.pass_code_enter_pass_code);
+                    mPassCodeHdrExplanation.setVisibility(View.INVISIBLE);
+                    setChangePassCodeView(false);
               }
             
            } else {
-                // pincode removal
-                mPinHdr.setText(R.string.pincode_remove_your_pincode);
-                mPinHdrExplanation.setVisibility(View.INVISIBLE);
-                mPinCodeChecked = false;
-                setChangePincodeView(true);
+                // pass code removal
+                mPassCodeHdr.setText(R.string.pass_code_remove_your_pass_code);
+                mPassCodeHdrExplanation.setVisibility(View.INVISIBLE);
+                mPassCodeChecked = false;
+                setChangePassCodeView(true);
            }
            
         }
@@ -130,8 +129,8 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
      
     protected void setInitVars(){
-        mConfirmingPinCode = false;
-        mPinCodeChecked = false;
+        mConfirmingPassCode = false;
+        mPassCodeChecked = false;
         mNewPasswordEntered = false;
 
     }
@@ -139,12 +138,12 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     protected void setInitView(){
         mBCancel.setVisibility(View.INVISIBLE);
         mBCancel.setVisibility(View.GONE);
-        mPinHdr.setText(R.string.pincode_enter_pin_code);
-        mPinHdrExplanation.setVisibility(View.INVISIBLE);
+        mPassCodeHdr.setText(R.string.pass_code_enter_pass_code);
+        mPassCodeHdrExplanation.setVisibility(View.INVISIBLE);
     }
     
    
-    protected void setChangePincodeView(boolean state){
+    protected void setChangePassCodeView(boolean state){
        
         if(state){
         mBCancel.setVisibility(View.VISIBLE);
@@ -195,7 +194,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             public void afterTextChanged(Editable s) {
                 if (s.length() > 0) {
-                    if (!mConfirmingPinCode){
+                    if (!mConfirmingPassCode){
                        mTempText[0] = mText1.getText().toString();
                        
                     }
@@ -224,7 +223,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             public void afterTextChanged(Editable s) {
                 if (s.length() > 0) {
-                    if (!mConfirmingPinCode){
+                    if (!mConfirmingPassCode){
                         mTempText[1] = mText2.getText().toString();
                     }
                     
@@ -241,7 +240,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
                     mText1.setText("");
                     mText1.requestFocus();
-                    if (!mConfirmingPinCode)
+                    if (!mConfirmingPassCode)
                        mTempText[0] = "";
                     mBChange= false;
                 
@@ -288,7 +287,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             public void afterTextChanged(Editable s) {
                 if (s.length() > 0) {
-                    if (!mConfirmingPinCode){
+                    if (!mConfirmingPassCode){
                         mTempText[2] = mText3.getText().toString();
                     }
                     mText4.requestFocus();
@@ -302,7 +301,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             public boolean onKey(View v, int keyCode, KeyEvent event) {
                 if (keyCode == KeyEvent.KEYCODE_DEL && mBChange) {
                     mText2.requestFocus();
-                    if (!mConfirmingPinCode)
+                    if (!mConfirmingPassCode)
                         mTempText[1] = "";
                     mText2.setText("");
                     mBChange= false;
@@ -356,23 +355,20 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             public void afterTextChanged(Editable s) {
                 if (s.length() > 0) {
                     
-                    if (!mConfirmingPinCode){
+                    if (!mConfirmingPassCode){
                        mTempText[3] = mText4.getText().toString();
                     }
                     mText1.requestFocus();
 
-                    if (!mPinCodeChecked){
-                        mPinCodeChecked = checkPincode();
+                    if (!mPassCodeChecked){
+                        mPassCodeChecked = checkPassCode();
                     }
                     
-                    if (mPinCodeChecked) {
-                        // TODO remove or update:
-                        // PassCodeManager.setUnlockTimestamp();
-
+                    if (mPassCodeChecked) {
                         if (ACTION_REQUEST.equals(getIntent().getAction())) {
                             finish();
 
-                        } else if (mPinCodeChecked) {
+                        } else if (mPassCodeChecked) {
                             String newState = getIntent().getStringExtra(EXTRA_NEW_STATE);
 
                             // TODO - next decision should done according to the current state of PIN in prefs (enable or not), not whatever says de client
@@ -383,15 +379,15 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                                 appPrefs.commit();
 
                                 setInitVars();
-                                pinCodeEnd(false);
+                                passCodeEnd(false);
 
                             } else {
 
-                                if (!mConfirmingPinCode) {
-                                    pinCodeChangeRequest();
+                                if (!mConfirmingPassCode) {
+                                    passCodeChangeRequest();
 
                                 } else {
-                                    confirmPincode();
+                                    confirmPassCode();
                                 }
                             }
 
@@ -409,7 +405,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             public boolean onKey(View v, int keyCode, KeyEvent event) {
                 if (keyCode == KeyEvent.KEYCODE_DEL && mBChange) {
                     mText3.requestFocus();
-                    if (!mConfirmingPinCode)
+                    if (!mConfirmingPassCode)
                         mTempText[2]="";
                     mText3.setText("");
                     mBChange= false;
@@ -455,17 +451,17 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     } // end setTextListener
     
     
-    protected void pinCodeChangeRequest(){
+    protected void passCodeChangeRequest(){
     
         clearBoxes(); 
-        mPinHdr.setText(R.string.pincode_reenter_your_pincode); 
-        mPinHdrExplanation.setVisibility(View.INVISIBLE);        
-        mConfirmingPinCode =true;
+        mPassCodeHdr.setText(R.string.pass_code_reenter_your_pass_code);
+        mPassCodeHdrExplanation.setVisibility(View.INVISIBLE);
+        mConfirmingPassCode =true;
         
     }
     
     
-    protected boolean checkPincode(){
+    protected boolean checkPassCode(){
         
         
         SharedPreferences appPrefs = PreferenceManager
@@ -490,10 +486,10 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             Toast.makeText(this, errorSeq, Toast.LENGTH_LONG).show();
             
             clearBoxes(); 
-            mPinHdr.setText(R.string.pincode_enter_pin_code);
-            mPinHdrExplanation.setVisibility(View.INVISIBLE);
+            mPassCodeHdr.setText(R.string.pass_code_enter_pass_code);
+            mPassCodeHdrExplanation.setVisibility(View.INVISIBLE);
             mNewPasswordEntered = true;
-            mConfirmingPinCode = false;
+            mConfirmingPassCode = false;
             
         }
      
@@ -501,9 +497,9 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         return false;
     }
     
-    protected void confirmPincode(){
+    protected void confirmPassCode(){
         
-        mConfirmingPinCode = false;
+        mConfirmingPassCode = false;
         
         String rText1 = mText1.getText().toString();
         String rText2 = mText2.getText().toString();
@@ -515,34 +511,34 @@ public class PinCodeActivity extends SherlockFragmentActivity {
              mTempText[2].equals(rText3) &&
              mTempText[3].equals(rText4) ) {
                         
-            savePincodeAndExit();
+            savePassCodeAndExit();
             
         } else {
             Arrays.fill(mTempText, null);
-            CharSequence cseq = getString(R.string.pincode_mismatch);
+            CharSequence cseq = getString(R.string.pass_code_mismatch);
             Toast.makeText(this, cseq, Toast.LENGTH_LONG).show();
             
-            mPinHdr.setText(R.string.pincode_configure_your_pin);
-            mPinHdrExplanation.setVisibility(View.VISIBLE);
+            mPassCodeHdr.setText(R.string.pass_code_configure_your_pass_code);
+            mPassCodeHdrExplanation.setVisibility(View.VISIBLE);
             clearBoxes();
         }
     
     }
    
     
-    protected void pinCodeEnd(boolean state){
+    protected void passCodeEnd(boolean state){
         CharSequence cseq;
         if (state){
-           cseq = getString(R.string.pincode_stored);
+           cseq = getString(R.string.pass_code_stored);
         }else{
-             cseq = getString(R.string.pincode_removed);
+             cseq = getString(R.string.pass_code_removed);
         }
         
         Toast.makeText(this, cseq, Toast.LENGTH_LONG).show();
         finish();
     }
     
-    protected void savePincodeAndExit(){
+    protected void savePassCodeAndExit(){
         SharedPreferences.Editor appPrefs = PreferenceManager
                 .getDefaultSharedPreferences(getApplicationContext()).edit();
         
@@ -553,7 +549,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         appPrefs.putBoolean("set_pincode",true);
         appPrefs.commit();
         
-        pinCodeEnd(true);
+        passCodeEnd(true);
     }
     
     
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 7429f32b..e66cefd3 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -58,7 +58,6 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.authentication.AuthenticatorActivity;
-import com.owncloud.android.authentication.PassCodeManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.db.DbHandler;
@@ -167,9 +166,9 @@ public class Preferences extends SherlockPreferenceActivity
             pCode.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);
-                    i.setAction(PinCodeActivity.ACTION_TOGGLE);
-                    i.putExtra(PinCodeActivity.EXTRA_NEW_STATE, newValue.toString());
+                    Intent i = new Intent(getApplicationContext(), PassCodeActivity.class);
+                    i.setAction(PassCodeActivity.ACTION_TOGGLE);
+                    i.putExtra(PassCodeActivity.EXTRA_NEW_STATE, newValue.toString());
                     startActivity(i);
                     
                     return true;
-- 
2.11.0