Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79087e4b authored by Jeff Brown's avatar Jeff Brown
Browse files

Add an API for deleting databases. 

Add SQLiteDatabase.deleteDatabase to delete a database and all
of its auxiliary files.

This method is also used by Context.deleteDatabase and resolves issues
where auxiliary files would get left behind.

Bug: 5972489
Change-Id: I3633b9b4978972a1d240ac0a9861420ecf989149
parent b7f2736e

api/current.txt

+3 −2
Original line number Diff line number Diff line
@@ -7275,6 +7275,7 @@ package android.database.sqlite { 
    method public android.database.sqlite.SQLiteStatement compileStatement(java.lang.String) throws android.database.SQLException;

    method public static android.database.sqlite.SQLiteDatabase create(android.database.sqlite.SQLiteDatabase.CursorFactory);

    method public int delete(java.lang.String, java.lang.String, java.lang.String[]);

    method public static boolean deleteDatabase(java.io.File);

    method public boolean enableWriteAheadLogging();

    method public void endTransaction();

    method public void execSQL(java.lang.String) throws android.database.SQLException;
@@ -7392,8 +7393,8 @@ package android.database.sqlite { 
    ctor public SQLiteOpenHelper(android.content.Context, java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int, android.database.DatabaseErrorHandler);

    method public synchronized void close();

    method public java.lang.String getDatabaseName();

    method public synchronized android.database.sqlite.SQLiteDatabase getReadableDatabase();

    method public synchronized android.database.sqlite.SQLiteDatabase getWritableDatabase();

    method public android.database.sqlite.SQLiteDatabase getReadableDatabase();

    method public android.database.sqlite.SQLiteDatabase getWritableDatabase();

    method public abstract void onCreate(android.database.sqlite.SQLiteDatabase);

    method public void onDowngrade(android.database.sqlite.SQLiteDatabase, int, int);

    method public void onOpen(android.database.sqlite.SQLiteDatabase);

core/java/android/app/ContextImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ class ContextImpl extends Context { 
    public boolean deleteDatabase(String name) {

        try {

            File f = validateFilePath(name, false);

            return f.delete();

            return SQLiteDatabase.deleteDatabase(f);

        } catch (Exception e) {

        }

        return false;

core/java/android/database/sqlite/SQLiteDatabase.java

+35 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.util.Printer; 
import dalvik.system.CloseGuard;



import java.io.File;

import java.io.FileFilter;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;
@@ -677,6 +678,40 @@ public class SQLiteDatabase extends SQLiteClosable { 
        return openDatabase(path, factory, CREATE_IF_NECESSARY, errorHandler);

    }



    /**

     * Deletes a database including its journal file and other auxiliary files

     * that may have been created by the database engine.

     *

     * @param file The database file path.

     * @return True if the database was successfully deleted.

     */

    public static boolean deleteDatabase(File file) {

        if (file == null) {

            throw new IllegalArgumentException("file must not be null");

        }



        boolean deleted = false;

        deleted |= file.delete();

        deleted |= new File(file.getPath() + "-journal").delete();

        deleted |= new File(file.getPath() + "-shm").delete();

        deleted |= new File(file.getPath() + "-wal").delete();



        File dir = file.getParentFile();

        if (dir != null) {

            final String prefix = file.getName() + "-mj";

            final FileFilter filter = new FileFilter() {

                @Override

                public boolean accept(File candidate) {

                    return candidate.getName().startsWith(prefix);

                }

            };

            for (File masterJournal : dir.listFiles(filter)) {

                deleted |= masterJournal.delete();

            }

        }

        return deleted;

    }



    /**

     * Reopens the database in read-write mode.

     * If the database is already read-write, does nothing.