Format to make checkstyle happy. Remove unused code.
This commit is contained in:
parent
938c992023
commit
12d5c5c7b4
F-Droid
src/org/fdroid/fdroid
test/src/org/fdroid/fdroid
@ -34,7 +34,7 @@ public class RepoPersister {
|
|||||||
* values changed in the index, some fields should not be updated. Rather, they should be
|
* values changed in the index, some fields should not be updated. Rather, they should be
|
||||||
* ignored, because they were explicitly set by the user, and hence can't be automatically
|
* ignored, because they were explicitly set by the user, and hence can't be automatically
|
||||||
* overridden by the index.
|
* overridden by the index.
|
||||||
*
|
* <p/>
|
||||||
* NOTE: In the future, these attributes will be moved to a join table, so that the app table
|
* NOTE: In the future, these attributes will be moved to a join table, so that the app table
|
||||||
* is essentially completely transient, and can be nuked at any time.
|
* is essentially completely transient, and can be nuked at any time.
|
||||||
*/
|
*/
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
package org.fdroid.fdroid;
|
|
||||||
|
|
||||||
import org.fdroid.fdroid.data.AppProvider;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class that makes available all ContentProviders that F-Droid owns.
|
|
||||||
*/
|
|
||||||
public abstract class FDroidTestWithAllProviders extends FDroidProviderTest<AppProvider> {
|
|
||||||
|
|
||||||
public FDroidTestWithAllProviders(Class<AppProvider> providerClass, String providerAuthority) {
|
|
||||||
super(providerClass, providerAuthority);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected String[] getMinimalProjection() {
|
|
||||||
return new String[] {
|
|
||||||
AppProvider.DataColumns._ID,
|
|
||||||
AppProvider.DataColumns.APP_ID,
|
|
||||||
AppProvider.DataColumns.NAME,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -17,7 +17,6 @@ import android.util.Log;
|
|||||||
import org.fdroid.fdroid.RepoUpdater.UpdateException;
|
import org.fdroid.fdroid.RepoUpdater.UpdateException;
|
||||||
import org.fdroid.fdroid.data.Apk;
|
import org.fdroid.fdroid.data.Apk;
|
||||||
import org.fdroid.fdroid.data.ApkProvider;
|
import org.fdroid.fdroid.data.ApkProvider;
|
||||||
import org.fdroid.fdroid.data.App;
|
|
||||||
import org.fdroid.fdroid.data.AppProvider;
|
import org.fdroid.fdroid.data.AppProvider;
|
||||||
import org.fdroid.fdroid.data.Repo;
|
import org.fdroid.fdroid.data.Repo;
|
||||||
import org.fdroid.fdroid.data.RepoProvider;
|
import org.fdroid.fdroid.data.RepoProvider;
|
||||||
|
@ -214,18 +214,6 @@ public class TestUtils {
|
|||||||
return tempFile;
|
return tempFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static File getWriteableDir(Context context) {
|
|
||||||
File[] dirsToTry = new File[] {
|
|
||||||
context.getCacheDir(),
|
|
||||||
context.getFilesDir(),
|
|
||||||
context.getExternalCacheDir(),
|
|
||||||
context.getExternalFilesDir(null),
|
|
||||||
Environment.getExternalStorageDirectory()
|
|
||||||
};
|
|
||||||
|
|
||||||
return getWriteableDir(dirsToTry);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Prefer internal over external storage, because external tends to be FAT filesystems,
|
* Prefer internal over external storage, because external tends to be FAT filesystems,
|
||||||
* which don't support symlinks (which we test using this method).
|
* which don't support symlinks (which we test using this method).
|
||||||
@ -244,7 +232,7 @@ public class TestUtils {
|
|||||||
context.getExternalFilesDir(null),
|
context.getExternalFilesDir(null),
|
||||||
targetContext.getExternalCacheDir(),
|
targetContext.getExternalCacheDir(),
|
||||||
targetContext.getExternalFilesDir(null),
|
targetContext.getExternalFilesDir(null),
|
||||||
Environment.getExternalStorageDirectory()
|
Environment.getExternalStorageDirectory(),
|
||||||
};
|
};
|
||||||
|
|
||||||
return getWriteableDir(dirsToTry);
|
return getWriteableDir(dirsToTry);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user