1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-26 22:32:11 +01:00

Compare commits

..

No commits in common. "4ebd3932509f927874765de030fd4c36f40b1a9c" and "ff62aa5a07b69ac6cf69cbfb85610a57b1f8dd01" have entirely different histories.

2 changed files with 3 additions and 3 deletions

View file

@ -12,8 +12,8 @@ android {
defaultConfig { defaultConfig {
resValue "string", "manifest_package_id", "com.github.dfa.diaspora_android" resValue "string", "manifest_package_id", "com.github.dfa.diaspora_android"
applicationId "com.github.dfa.diaspora_android" applicationId "com.github.dfa.diaspora_android"
versionName "1.3.5" versionName "1.3.4"
versionCode 46 versionCode 45
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
minSdkVersion rootProject.ext.version_minSdk minSdkVersion rootProject.ext.version_minSdk

View file

@ -664,7 +664,7 @@ public class MainActivity extends ThemedActivity
protected void onResume() { protected void onResume() {
AppLog.v(this, "onResume()"); AppLog.v(this, "onResume()");
super.onResume(); super.onResume();
//new AndroidSupportMeWrapper(this).mainOnResume(); new AndroidSupportMeWrapper(this).mainOnResume();
AppLog.v(this, "Register BroadcastReceivers"); AppLog.v(this, "Register BroadcastReceivers");
LocalBroadcastManager.getInstance(this).registerReceiver(brSetTitle, new IntentFilter(ACTION_UPDATE_TITLE_FROM_URL)); LocalBroadcastManager.getInstance(this).registerReceiver(brSetTitle, new IntentFilter(ACTION_UPDATE_TITLE_FROM_URL));
LocalBroadcastManager.getInstance(this).registerReceiver(brOpenExternalLink, new IntentFilter(ACTION_OPEN_EXTERNAL_URL)); LocalBroadcastManager.getInstance(this).registerReceiver(brOpenExternalLink, new IntentFilter(ACTION_OPEN_EXTERNAL_URL));