Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Version: 1.1.4
Fix the bug that navigation may crash the app when the app just resumes from other app such as facebook login

Version: 1.1.3
* Broke Android SDK dependency out from Android Mvc Controller module
* Update Espresso to 2.2
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ The library is currently release to jCenter and MavenCentral
<dependency>
<groupId>com.shipdream</groupId>
<artifactId>android-mvc</artifactId>
<version>1.1.3</version>
<version>1.1.4</version>
</dependency>
```

**Gradle:**
```groovy
compile "com.shipdream:android-mvc:1.1.3"
compile "com.shipdream:android-mvc:1.1.4"
```

## Dependency injection with reference count
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def jacocoCoveredProjects = [
project(":library:android-mvc-controller")
]

allprojects{
allprojects {
repositories {
jcenter()
mavenLocal()
Expand All @@ -62,7 +62,7 @@ ext {
version = [
major: 1,
minor: 1,
patch : 3
patch : 4
]
libGroup = 'com.shipdream'
libVersion = "${version.major}.${version.minor}.${version.patch}"
Expand Down
4 changes: 2 additions & 2 deletions documents/sites/Site-MarkDown.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ The library is currently release to jCenter and MavenCentral
<dependency>
<groupId>com.shipdream</groupId>
<artifactId>android-mvc</artifactId>
<version>1.1.3</version>
<version>1.1.4</version>
</dependency>
```

**Gradle:**
```groovy
compile "com.shipdream:android-mvc:1.1.3"
compile "com.shipdream:android-mvc:1.1.4"
```

## Samples
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ void addPendingOnViewReadyActions(Runnable runnable) {
public static abstract class DelegateFragment extends MvcFragment {
private static final String MVC_STATE_BUNDLE_KEY = AndroidMvc.MVC_SATE_PREFIX + "RootBundle";
private Logger mLogger = LoggerFactory.getLogger(getClass());
//Mimic the behavior of Android framework to manage the state save state
private boolean mStateSaved = false;
//Track if the state is saved and not able to commit fragment transaction
private boolean canCommitFragmentTransaction = false;
private List<Runnable> mPendingNavActions = new ArrayList<>();
private List<Runnable> mPendingOnViewReadyActions = new ArrayList<>();

Expand Down Expand Up @@ -325,9 +325,10 @@ public void onViewStateRestored(Bundle savedInstanceState) {
protected abstract void onStartUp();

@Override
public void onStart() {
super.onStart();
mStateSaved = false;
public void onResume() {
super.onResume();
canCommitFragmentTransaction = true;

runPendingNavigationActions();
}

Expand All @@ -341,9 +342,9 @@ private void runPendingNavigationActions() {
}

@Override
public void onStop() {
super.onStop();
mStateSaved = true;
public void onPause() {
super.onPause();
canCommitFragmentTransaction = false;
}

@Override
Expand All @@ -357,9 +358,7 @@ public void onSaveInstanceState(Bundle outState) {
}

public void onEvent(final NavigationController.EventC2V.OnLocationForward event) {
if (mStateSaved) {
//TODO: seems will have potential problem when the app is killed. Should
//respond back to nav controller to issue the back action action when the app restarts.
if (!canCommitFragmentTransaction) {
mPendingNavActions.add(new Runnable() {
@Override
public void run() {
Expand Down Expand Up @@ -428,7 +427,7 @@ private void performForwardNav(NavigationController.EventC2V.OnLocationForward e
}

public void onEvent(final NavigationController.EventC2V.OnLocationBack event) {
if (mStateSaved) {
if (!canCommitFragmentTransaction) {
mPendingNavActions.add(new Runnable() {
@Override
public void run() {
Expand Down