diff options
Diffstat (limited to 'app/src/main/java/net/lacolaco/smileessence/activity')
8 files changed, 21 insertions, 20 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java index 901e372d..0a0b531d 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java @@ -83,7 +83,7 @@ public class EditCommandActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { - setTheme(Application.getThemeResId()); + setTheme(Application.getInstance().getThemeResId()); super.onCreate(savedInstanceState); setContentView(R.layout.layout_edit_list); diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.java index 8d8a36da..5543e679 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.java @@ -111,7 +111,7 @@ public class EditExtractionActivity extends Activity implements AdapterView.OnIt @Override protected void onCreate(Bundle savedInstanceState) { - setTheme(Application.getThemeResId()); + setTheme(Application.getInstance().getThemeResId()); super.onCreate(savedInstanceState); setContentView(R.layout.layout_edit_list); diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java index 58ee1d8a..521b0691 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java @@ -87,7 +87,7 @@ public class EditTabActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { - setTheme(Application.getThemeResId()); + setTheme(Application.getInstance().getThemeResId()); super.onCreate(savedInstanceState); setContentView(R.layout.layout_edit_list); diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java index 44dfff4d..1ae7376d 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java @@ -111,7 +111,7 @@ public class EditTemplateActivity extends Activity implements AdapterView.OnItem @Override protected void onCreate(Bundle savedInstanceState) { - setTheme(Application.getThemeResId()); + setTheme(Application.getInstance().getThemeResId()); super.onCreate(savedInstanceState); setContentView(R.layout.layout_edit_list); diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.java index 53946bd4..8d159502 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.java @@ -60,7 +60,7 @@ public class LicenseActivity extends Activity { @Override public void onCreate(Bundle savedInstanceState) { - setTheme(Application.getThemeResId()); + setTheme(Application.getInstance().getThemeResId()); super.onCreate(savedInstanceState); setContentView(R.layout.layout_license); diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java index d1e45509..23a81500 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java @@ -153,7 +153,7 @@ public class MainActivity extends Activity { @Override public void onCreate(Bundle savedInstanceState) { Logger.debug("onCreate"); - setTheme(Application.getThemeResId()); + setTheme(Application.getInstance().getThemeResId()); super.onCreate(savedInstanceState); setContentView(R.layout.layout_main); Notificator.initialize(this); @@ -176,6 +176,7 @@ public class MainActivity extends Activity { stream.shutdown(); } Notificator.getInstance().onBackground(); + Application.getInstance().resetState(); Logger.debug("onDestroy"); } @@ -227,15 +228,15 @@ public class MainActivity extends Activity { return true; } case R.id.actionbar_favstar: { - new CommandOpenURL(this, Application.getCurrentAccount().getUser().getFavstarRecentURL()).execute(); + new CommandOpenURL(this, Application.getInstance().getCurrentAccount().getUser().getFavstarRecentURL()).execute(); return true; } case R.id.actionbar_aclog: { - new CommandOpenURL(this, Application.getCurrentAccount().getUser().getAclogTimelineURL()).execute(); + new CommandOpenURL(this, Application.getInstance().getCurrentAccount().getUser().getAclogTimelineURL()).execute(); return true; } case R.id.actionbar_twilog: { - new CommandOpenURL(this, Application.getCurrentAccount().getUser().getTwilogURL()).execute(); + new CommandOpenURL(this, Application.getInstance().getCurrentAccount().getUser().getTwilogURL()).execute(); return true; } case R.id.actionbar_report: { @@ -337,8 +338,8 @@ public class MainActivity extends Activity { if (stream != null) { stream.shutdown(); } - stream = Application.getCurrentAccount().getTwitterStream(); - userStreamListener = new UserStreamListener(Application.getCurrentAccount()); + stream = Application.getInstance().getCurrentAccount().getTwitterStream(); + userStreamListener = new UserStreamListener(Application.getInstance().getCurrentAccount()); stream.addListener(userStreamListener); stream.addConnectionLifeCycleListener(userStreamListener); stream.user(); @@ -350,7 +351,7 @@ public class MainActivity extends Activity { return; // TODO: error message? } - Account account = Application.getCurrentAccount(); + Account account = Application.getInstance().getCurrentAccount(); User user = account.getUser(); startStream(); MuteUserIds.refresh(account); @@ -428,7 +429,7 @@ public class MainActivity extends Activity { account = Account.all().get(0); } if (account != null) { - Application.setCurrentAccount(account); + Application.getInstance().setCurrentAccount(account); return true; } else { return false; diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.java index 792aef87..3fc7c937 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.java @@ -48,7 +48,7 @@ public class ManageAccountsActivity extends Activity implements AdapterView.OnIt @Override protected void onCreate(Bundle savedInstanceState) { - setTheme(Application.getThemeResId()); + setTheme(Application.getInstance().getThemeResId()); super.onCreate(savedInstanceState); setContentView(R.layout.layout_edit_list); @@ -77,7 +77,7 @@ public class ManageAccountsActivity extends Activity implements AdapterView.OnIt ConfirmDialogFragment.show(this, getString(R.string.dialog_confirm_clear_account, account.getUser().getScreenName()), () -> { adapter.removeAt(i); Account.unregister(account.getModelId()); - if (account == Application.getCurrentAccount()) { + if (account == Application.getInstance().getCurrentAccount()) { setCurrentAccount(adapter.getItem(0)); } }, false); @@ -116,7 +116,7 @@ public class ManageAccountsActivity extends Activity implements AdapterView.OnIt } private void safeFinish() { - if (Application.getCurrentAccount() != null) { + if (Application.getInstance().getCurrentAccount() != null) { setResult(RESULT_OK); finish(); } else { @@ -145,7 +145,7 @@ public class ManageAccountsActivity extends Activity implements AdapterView.OnIt data.getLongExtra(OAuthSession.KEY_USER_ID, -1L), data.getStringExtra(OAuthSession.KEY_SCREEN_NAME)); adapter.add(account); - if (Application.getCurrentAccount() == null) { + if (Application.getInstance().getCurrentAccount() == null) { setCurrentAccount(account); } } else { @@ -155,7 +155,7 @@ public class ManageAccountsActivity extends Activity implements AdapterView.OnIt } private void setCurrentAccount(Account account) { - Application.setCurrentAccount(account); + Application.getInstance().setCurrentAccount(account); InternalPreferenceHelper.getInstance().set(R.string.key_last_used_account_id, account.getModelId()); } @@ -190,7 +190,7 @@ public class ManageAccountsActivity extends Activity implements AdapterView.OnIt Account account = getItem(position); TextView textView = (TextView) convertView.findViewById(R.id.textView_menuItem_simple); String text = account.getUser().getScreenName(); - if (account == Application.getCurrentAccount()) { + if (account == Application.getInstance().getCurrentAccount()) { text = "(*) " + text; } textView.setText(text); // TODO: show profile image diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.java index 2cd63e49..c9370025 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.java @@ -37,7 +37,7 @@ public class SettingActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { - setTheme(Application.getThemeResId()); + setTheme(Application.getInstance().getThemeResId()); super.onCreate(savedInstanceState); setContentView(R.layout.layout_setting); } |