X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/ef034fd6b8b5e23c73681415bd4a28d27524549a..5709757b119d589f5852987e3f444d7cf1d49657:/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 f6b5aff3..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(); @@ -273,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())) { @@ -289,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())) {