yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

Config.runOnStart() => Config.runOnConnect()

Browse source
This commit is contained in:
Nikolay Pultsin 2014-04-19 23:19:30 +01:00
parent 2d2361d078
commit 2d08f9e149
10 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/org/geometerplus/android/fbreader/FBReader.java
View file

@ -145,7 +145,7 @@ public final class FBReader extends Activity implements ZLApplicationWindow {
myBook = null; myBook = null;
} }
} }
Config.Instance().runOnStart(new Runnable() { Config.Instance().runOnConnect(new Runnable() {
public void run() { public void run() {
myFBReaderApp.openBook(myBook, bookmark, action); myFBReaderApp.openBook(myBook, bookmark, action);
AndroidFontUtil.clearFontCache(); AndroidFontUtil.clearFontCache();
@ -201,7 +201,7 @@ public final class FBReader extends Activity implements ZLApplicationWindow {
); );
final Config config = Config.Instance(); final Config config = Config.Instance();
config.runOnStart(new Runnable() { config.runOnConnect(new Runnable() {
public void run() { public void run() {
config.requestAllValuesForGroup("Options"); config.requestAllValuesForGroup("Options");
config.requestAllValuesForGroup("Style"); config.requestAllValuesForGroup("Style");
@ -372,7 +372,7 @@ public final class FBReader extends Activity implements ZLApplicationWindow {
final ZLAndroidLibrary zlibrary = getZLibrary(); final ZLAndroidLibrary zlibrary = getZLibrary();
Config.Instance().runOnStart(new Runnable() { Config.Instance().runOnConnect(new Runnable() {
public void run() { public void run() {
final boolean showStatusBar = zlibrary.ShowStatusBarOption.getValue(); final boolean showStatusBar = zlibrary.ShowStatusBarOption.getValue();
if (showStatusBar != myShowStatusBarFlag) { if (showStatusBar != myShowStatusBarFlag) {
@ -451,7 +451,7 @@ public final class FBReader extends Activity implements ZLApplicationWindow {
super.onResume(); super.onResume();
myStartTimer = true; myStartTimer = true;
Config.Instance().runOnStart(new Runnable() { Config.Instance().runOnConnect(new Runnable() {
public void run() { public void run() {
final int brightnessLevel = final int brightnessLevel =
getZLibrary().ScreenBrightnessLevelOption.getValue(); getZLibrary().ScreenBrightnessLevelOption.getValue();

2
src/org/geometerplus/android/fbreader/config/ConfigShadow.java
View file

@ -61,7 +61,7 @@ public final class ConfigShadow extends Config implements ServiceConnection {
} }
@Override @Override
public void runOnStart(Runnable runnable) { public void runOnConnect(Runnable runnable) {
if (myInterface != null) { if (myInterface != null) {
runnable.run(); runnable.run();
} else { } else {

2
src/org/geometerplus/android/fbreader/crash/FixBooksDirectoryActivity.java
View file

@ -61,7 +61,7 @@ public class FixBooksDirectoryActivity extends Activity {
final View selectButton = findViewById(R.id.books_directory_fix_select_button); final View selectButton = findViewById(R.id.books_directory_fix_select_button);
Config.Instance().runOnStart(new Runnable() { Config.Instance().runOnConnect(new Runnable() {
public void run() { public void run() {
final ZLStringOption tempDirectoryOption = Paths.TempDirectoryOption(); final ZLStringOption tempDirectoryOption = Paths.TempDirectoryOption();
myDirectoryView.setText(tempDirectoryOption.getValue()); myDirectoryView.setText(tempDirectoryOption.getValue());

4
src/org/geometerplus/android/fbreader/libraryService/BookCollectionShadow.java
View file

@ -64,7 +64,7 @@ public class BookCollectionShadow extends AbstractBookCollection implements Serv
public synchronized void bindToService(Context context, Runnable onBindAction) { public synchronized void bindToService(Context context, Runnable onBindAction) {
if (myInterface != null && myContext == context) { if (myInterface != null && myContext == context) {
if (onBindAction != null) { if (onBindAction != null) {
Config.Instance().runOnStart(onBindAction); Config.Instance().runOnConnect(onBindAction);
} }
} else { } else {
if (onBindAction != null) { if (onBindAction != null) {
@ -462,7 +462,7 @@ public class BookCollectionShadow extends AbstractBookCollection implements Serv
public synchronized void onServiceConnected(ComponentName name, IBinder service) { public synchronized void onServiceConnected(ComponentName name, IBinder service) {
myInterface = LibraryInterface.Stub.asInterface(service); myInterface = LibraryInterface.Stub.asInterface(service);
while (!myOnBindActions.isEmpty()) { while (!myOnBindActions.isEmpty()) {
Config.Instance().runOnStart(myOnBindActions.remove(0)); Config.Instance().runOnConnect(myOnBindActions.remove(0));
} }
if (myContext != null) { if (myContext != null) {
myContext.registerReceiver(myReceiver, new IntentFilter(LibraryService.BOOK_EVENT_ACTION)); myContext.registerReceiver(myReceiver, new IntentFilter(LibraryService.BOOK_EVENT_ACTION));

2
src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
View file

@ -95,7 +95,7 @@ public class LibraryService extends Service {
} }
public void reset(final boolean force) { public void reset(final boolean force) {
Config.Instance().runOnStart(new Runnable() { Config.Instance().runOnConnect(new Runnable() {
public void run() { public void run() {
resetInternal(force); resetInternal(force);
} }

2
src/org/geometerplus/android/fbreader/network/Util.java
View file

@ -55,7 +55,7 @@ public abstract class Util implements UserRegistrationConstants {
return; return;
} }
Config.Instance().runOnStart(new Runnable() { Config.Instance().runOnConnect(new Runnable() {
public void run() { public void run() {
UIUtil.wait("loadingNetworkLibrary", new Runnable() { UIUtil.wait("loadingNetworkLibrary", new Runnable() {
public void run() { public void run() {

2
src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java
View file

@ -129,7 +129,7 @@ abstract class ZLPreferenceActivity extends android.preference.PreferenceActivit
myScreen = getPreferenceManager().createPreferenceScreen(this); myScreen = getPreferenceManager().createPreferenceScreen(this);
final Intent intent = getIntent(); final Intent intent = getIntent();
Config.Instance().runOnStart(new Runnable() { Config.Instance().runOnConnect(new Runnable() {
public void run() { public void run() {
init(intent); init(intent);
} }

2
src/org/geometerplus/fbreader/tips/TipsManager.java
View file

@ -151,7 +151,7 @@ public class TipsManager {
myDownloadInProgress = true; myDownloadInProgress = true;
Config.Instance().runOnStart(new Runnable() { Config.Instance().runOnConnect(new Runnable() {
public void run() { public void run() {
final File tipsFile = new File(getLocalFilePath()); final File tipsFile = new File(getLocalFilePath());
tipsFile.getParentFile().mkdirs(); tipsFile.getParentFile().mkdirs();

2
src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java
View file

@ -47,7 +47,7 @@ public final class ZLKeyBindings {
private ZLKeyBindings(String name) { private ZLKeyBindings(String name) {
myName = name; myName = name;
Config.Instance().runOnStart(new Initializer()); Config.Instance().runOnConnect(new Initializer());
} }
private class Initializer implements Runnable { private class Initializer implements Runnable {

2
src/org/geometerplus/zlibrary/core/options/Config.java
View file

@ -100,7 +100,7 @@ public abstract class Config {
} }
public abstract boolean isInitialized(); public abstract boolean isInitialized();
public abstract void runOnStart(Runnable runnable); public abstract void runOnConnect(Runnable runnable);
public abstract List<String> listGroups(); public abstract List<String> listGroups();
public abstract List<String> listNames(String group); public abstract List<String> listNames(String group);