Commit: 724d0060f590b0feabc979e460320548863dc2ff - android_notepad (git)

Simple Notepad Application for Android OS

Commit MetaInfo

• Revision: 724d0060f590b0feabc979e460320548863dc2ff (tree)
• Time: 2019-05-04 23:35:08
• Author: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

Remove DB optimize background service.

Change Summary

• modified: doc/Changes.txt
• modified: notepad-app-level-11/src/main/AndroidManifest.xml
• modified: notepad-app-level-11/src/main/java/org/routine_work/notepad/NotepadActivity.java
• modified: notepad-app/src/main/AndroidManifest.xml
• modified: notepad-app/src/main/java/org/routine_work/notepad/NotepadActivity.java

Incremental Difference

--- a/doc/Changes.txt
+++ b/doc/Changes.txt
@@ -1,3 +1,8 @@
+1.0.17
+======
+
+* Remove DB optimize background service
+
 1.0.12
 ======
 

--- a/notepad-app-level-11/src/main/AndroidManifest.xml
+++ b/notepad-app-level-11/src/main/AndroidManifest.xml
@@ -245,8 +245,6 @@
 		<!-- Service : data initialize service -->
 		<service android:name=".template.NoteTemplateInitializer" />
 
-		<service android:name=".provider.NoteDBOptimizer" />
-
 		<service android:name=".prefs.BackupDatabaseService" />
 
 		<!-- Provider : Notes & Templates Content Provider  -->

--- a/notepad-app-level-11/src/main/java/org/routine_work/notepad/NotepadActivity.java
+++ b/notepad-app-level-11/src/main/java/org/routine_work/notepad/NotepadActivity.java
@@ -2,7 +2,7 @@
 /*
  * The MIT License
  *
- * Copyright 2012 Masahiko, SAWAI <[e-mail]>.
+ * Copyright 2012,2019 Masahiko, SAWAI <[e-mail]>.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -53,7 +53,6 @@ import org.routine_work.notepad.fragment.NoteListFragment;
 import org.routine_work.notepad.fragment.ViewNoteFragment;
 import org.routine_work.notepad.prefs.NotepadPreferenceActivity;
 import org.routine_work.notepad.prefs.NotepadPreferenceUtils;
-import org.routine_work.notepad.provider.NoteDBOptimizer;
 import org.routine_work.notepad.provider.NoteStore;
 import org.routine_work.notepad.template.NoteTemplateInitializer;
 import org.routine_work.notepad.template.NoteTemplatePickerDialogFragment;
@@ -69,7 +68,6 @@ public class NotepadActivity extends Activity implements NotepadConstants,
 {
 
 	public static final String ACTION_QUIT = NotepadActivity.class.getPackage().getName() + ".ACTION_QUIT";
-	private static final int DB_OPTIMIZER_COUNT = 128;
 	private static final String FT_NOTE_DETAIL = "FT_NOTE_DETAIL";
 	private static final String FT_NOTE_TEMPLATE_PICKER = "FT_NOTE_TEMPLATE_PICKER";
 	private static final String LOG_TAG = "simple-notepad";
@@ -194,13 +192,6 @@ public class NotepadActivity extends Activity implements NotepadConstants,
 	{
 		Log.v(LOG_TAG, "Hello");
 
-		int quitCount = NotepadPreferenceUtils.incrementQuitCount(this);
-		if ((quitCount % DB_OPTIMIZER_COUNT) == 0)
-		{
-			Intent noteDBOptimizerIntent = new Intent(this, NoteDBOptimizer.class);
-			startService(noteDBOptimizerIntent);
-		}
-
 		super.onDestroy();
 
 		Log.v(LOG_TAG, "Bye");
@@ -327,7 +318,8 @@ public class NotepadActivity extends Activity implements NotepadConstants,
 		Log.v(LOG_TAG, "searchView.isIconified() =>  " + searchView.isIconified()); // androud 4 : true, androud 7 : false
 		Log.v(LOG_TAG, "searchView.isShown() =>  " + searchView.isShown());
 
-		if ((keyCode == KeyEvent.KEYCODE_BACK) && searchView.isShown() && !searchView.isIconified())
+		if ((keyCode == KeyEvent.KEYCODE_BACK)
+			&& (searchView != null && searchView.isShown() && !searchView.isIconified()))
 		{
 			Log.v(LOG_TAG, "Close SeachView");
 			searchView.setQuery(null, false);

--- a/notepad-app/src/main/AndroidManifest.xml
+++ b/notepad-app/src/main/AndroidManifest.xml
@@ -240,8 +240,6 @@
 		<!-- Service : data initialize service -->
 		<service android:name=".template.NoteTemplateInitializer" />
 
-		<service android:name=".provider.NoteDBOptimizer" />
-
 		<service android:name=".prefs.BackupDatabaseService" />
 
 		<!-- Provider : Notes & Templates Content Provider  -->

--- a/notepad-app/src/main/java/org/routine_work/notepad/NotepadActivity.java
+++ b/notepad-app/src/main/java/org/routine_work/notepad/NotepadActivity.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright 2012-2013 Masahiko, SAWAI <[e-mail]>.
+ * Copyright 2012-2013,2019 Masahiko, SAWAI <[e-mail]>.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -47,7 +47,6 @@ import android.widget.AdapterView.OnItemClickListener;
 import java.util.Arrays;
 import org.routine_work.notepad.prefs.NotepadPreferenceActivity;
 import org.routine_work.notepad.prefs.NotepadPreferenceUtils;
-import org.routine_work.notepad.provider.NoteDBOptimizer;
 import org.routine_work.notepad.provider.NoteStore;
 import org.routine_work.notepad.template.NoteTemplateInitializer;
 import org.routine_work.notepad.template.NoteTemplatePickerDialog;
@@ -68,7 +67,6 @@ public class NotepadActivity extends ListActivity
 	NotepadConstants
 {
 
-	private static final int DB_OPTIMIZER_COUNT = 128;
 	private static final String LOG_TAG = "simple-notepad";
 	private static final String ACTION_QUIT = NotepadConstants.class.getPackage().getName() + ".QUIT";
 	private static final String SAVE_KEY_ACTION_MODE = "ACTION_MODE";
@@ -218,13 +216,6 @@ public class NotepadActivity extends ListActivity
 			cursor = null;
 		}
 
-		int quitCount = NotepadPreferenceUtils.incrementQuitCount(this);
-		if ((quitCount % DB_OPTIMIZER_COUNT) == 0)
-		{
-			Intent noteDBOptimizerIntent = new Intent(this, NoteDBOptimizer.class);
-			startService(noteDBOptimizerIntent);
-		}
-
 		super.onDestroy();
 
 		Log.v(LOG_TAG, "Bye");