#365 Password protection

Refactoring

5 files changed, 35 insertions, 37 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dc951d42..ab695d90 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -89,7 +89,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".android.appwidget.NoteListWidgetConfiguration">
+        <activity android:name=".android.activity.NoteListWidgetConfigurationActivity">
 
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetConfiguration.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NoteListWidgetConfigurationActivity.java
index e73636ee..16339bd0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetConfiguration.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NoteListWidgetConfigurationActivity.java
@@ -1,4 +1,4 @@
-package it.niedermann.owncloud.notes.android.appwidget;
+package it.niedermann.owncloud.notes.android.activity;
 
 import android.app.Activity;
 import android.appwidget.AppWidgetManager;
@@ -11,8 +11,6 @@ import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
@@ -23,16 +21,21 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
 import it.niedermann.owncloud.notes.R;
-import it.niedermann.owncloud.notes.android.activity.NotesListViewActivity;
+import it.niedermann.owncloud.notes.android.appwidget.NoteListWidget;
 import it.niedermann.owncloud.notes.model.LocalAccount;
 import it.niedermann.owncloud.notes.model.NavigationAdapter;
 import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
 import it.niedermann.owncloud.notes.util.Notes;
 
-public class NoteListWidgetConfiguration extends AppCompatActivity {
+public class NoteListWidgetConfigurationActivity extends LockedActivity {
     private static final String TAG = Activity.class.getSimpleName();
 
+    @BindView(R.id.recycler_view)
+    RecyclerView recyclerView;
+
     private int appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
 
 
@@ -45,8 +48,11 @@ public class NoteListWidgetConfiguration extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setResult(RESULT_CANCELED);
+
         setContentView(R.layout.activity_note_list_configuration);
+        ButterKnife.bind(this);
+
+        setResult(RESULT_CANCELED);
 
         db = NoteSQLiteOpenHelper.getInstance(this);
         try {
@@ -62,7 +68,7 @@ public class NoteListWidgetConfiguration extends AppCompatActivity {
 
         if (extras != null) {
             appWidgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID,
-                                            AppWidgetManager.INVALID_APPWIDGET_ID);
+                    AppWidgetManager.INVALID_APPWIDGET_ID);
         }
 
         if (appWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
@@ -71,15 +77,13 @@ public class NoteListWidgetConfiguration extends AppCompatActivity {
         }
 
         itemRecent = new NavigationAdapter.NavigationItem(NotesListViewActivity.ADAPTER_KEY_RECENT,
-                                                            getString(R.string.label_all_notes),
-                                                            null,
-                                                            R.drawable.ic_access_time_grey600_24dp);
+                getString(R.string.label_all_notes),
+                null,
+                R.drawable.ic_access_time_grey600_24dp);
         itemFavorites = new NavigationAdapter.NavigationItem(NotesListViewActivity.ADAPTER_KEY_STARRED,
-                                                            getString(R.string.label_favorites),
-                                                            null,
-                                                            R.drawable.ic_star_yellow_24dp);
-        RecyclerView recyclerView;
-        RecyclerView.LayoutManager layoutManager;
+                getString(R.string.label_favorites),
+                null,
+                R.drawable.ic_star_yellow_24dp);
 
         adapterCategories = new NavigationAdapter(new NavigationAdapter.ClickListener() {
             @Override
@@ -103,8 +107,8 @@ public class NoteListWidgetConfiguration extends AppCompatActivity {
                 sp.putBoolean(NoteListWidget.DARK_THEME_KEY + appWidgetId, Notes.getAppTheme(getApplicationContext()));
                 sp.apply();
 
-                Intent updateIntent = new Intent(   AppWidgetManager.ACTION_APPWIDGET_UPDATE, null,
-                                                    getApplicationContext(), NoteListWidget.class);
+                Intent updateIntent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null,
+                        getApplicationContext(), NoteListWidget.class);
                 updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
                 setResult(RESULT_OK, updateIntent);
                 getApplicationContext().sendBroadcast(updateIntent);
@@ -116,10 +120,7 @@ public class NoteListWidgetConfiguration extends AppCompatActivity {
             }
         });
 
-        recyclerView = findViewById(R.id.nlw_config_recyclerv);
         recyclerView.setHasFixedSize(true);
-        layoutManager = new LinearLayoutManager(this);
-        recyclerView.setLayoutManager(layoutManager);
         recyclerView.setAdapter(adapterCategories);
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/Notes.java b/app/src/main/java/it/niedermann/owncloud/notes/util/Notes.java
index 591d52fe..898b6a5a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/util/Notes.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/util/Notes.java
@@ -11,13 +11,16 @@ import androidx.appcompat.app.AppCompatDelegate;
 public class Notes extends Application {
     private static final String TAG = Notes.class.getCanonicalName();
 
-    private static final String DARK_THEME = "darkTheme";
+    private static final String PREF_KEY_DARK_THEME = "darkTheme";
+    private static final String PREF_KEY_LOCKED = "lock";
     private static boolean lockedPreference = false;
     private static boolean locked = true;
 
     @Override
     public void onCreate() {
         setAppTheme(getAppTheme(getApplicationContext()));
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        lockedPreference = prefs.getBoolean(PREF_KEY_LOCKED, false);
         super.onCreate();
     }
 
@@ -31,7 +34,7 @@ public class Notes extends Application {
 
     public static boolean getAppTheme(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return prefs.getBoolean(DARK_THEME, false);
+        return prefs.getBoolean(PREF_KEY_DARK_THEME, false);
     }
 
     public static void setLockedPreference(boolean lockedPreference) {
diff --git a/app/src/main/res/layout/activity_note_list_configuration.xml b/app/src/main/res/layout/activity_note_list_configuration.xml
index bcc95ef5..bf14a9fe 100644
--- a/app/src/main/res/layout/activity_note_list_configuration.xml
+++ b/app/src/main/res/layout/activity_note_list_configuration.xml
@@ -1,14 +1,8 @@
-<RelativeLayout android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/nlw_config_recyclerv"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        tools:listitem="@layout/item_navigation"/>
-
-</RelativeLayout>
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/recycler_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+    tools:listitem="@layout/item_navigation" />
diff --git a/app/src/main/res/xml/note_list_widget_provider_info.xml b/app/src/main/res/xml/note_list_widget_provider_info.xml
index 16c90bb6..370d3b03 100644
--- a/app/src/main/res/xml/note_list_widget_provider_info.xml
+++ b/app/src/main/res/xml/note_list_widget_provider_info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:initialLayout="@layout/widget_note_list"
-    android:configure="it.niedermann.owncloud.notes.android.appwidget.NoteListWidgetConfiguration"
+    android:configure="it.niedermann.owncloud.notes.android.activity.NoteListWidgetConfigurationActivity"
     android:minHeight="110dp"
     android:minWidth="180dp"
     android:minResizeHeight="40dp"