@ -652,6 +652,7 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
public void onClick ( DialogInterface dialog , int which ) {
public void onClick ( DialogInterface dialog , int which ) {
// TODO: Make all data private
// TODO: Make all data private
final ProgressDialog pd = DialogUtilities . progressDialog ( ActFmLoginActivity . this , getString ( R . string . actfm_logged_in_different_user_processing ) ) ;
final ProgressDialog pd = DialogUtilities . progressDialog ( ActFmLoginActivity . this , getString ( R . string . actfm_logged_in_different_user_processing ) ) ;
new Thread ( new Runnable ( ) {
new Thread ( new Runnable ( ) {
@Override
@Override
public void run ( ) {
public void run ( ) {
@ -679,7 +680,7 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
runOnUiThread ( new Runnable ( ) {
runOnUiThread ( new Runnable ( ) {
@Override
@Override
public void run ( ) {
public void run ( ) {
finishSignIn ( result , token );
finishSignIn ( result , token , true );
}
}
} ) ;
} ) ;
pd . dismiss ( ) ;
pd . dismiss ( ) ;
@ -691,14 +692,14 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
@Override
@Override
public void onClick ( DialogInterface dialog , int which ) {
public void onClick ( DialogInterface dialog , int which ) {
deleteDatabase ( database . getName ( ) ) ;
deleteDatabase ( database . getName ( ) ) ;
finishSignIn ( result , token );
finishSignIn ( result , token , true );
}
}
} ) ;
} ) ;
} else {
} else {
finishSignIn ( result , token );
finishSignIn ( result , token , false );
}
}
} else {
} else {
finishSignIn ( result , token );
finishSignIn ( result , token , false );
}
}
}
}
@ -774,18 +775,19 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
for ( tlmCursor . moveToFirst ( ) ; ! tlmCursor . isAfterLast ( ) ; tlmCursor . moveToNext ( ) ) {
for ( tlmCursor . moveToFirst ( ) ; ! tlmCursor . isAfterLast ( ) ; tlmCursor . moveToNext ( ) ) {
tlm . clear ( ) ;
tlm . clear ( ) ;
tlm . readFromCursor ( tlmCursor ) ;
tlm . readFromCursor ( tlmCursor ) ;
tlm . setValue ( TaskListMetadata . UUID , uuidTaskListMetadataMap . get ( tlm . getUuid ( ) ) ) ;
String taskIds = tlm . getValue ( TaskListMetadata . TASK_IDS ) ;
String taskIds = tlm . getValue ( TaskListMetadata . TASK_IDS ) ;
if ( ! TaskListMetadata . taskIdsIsEmpty ( taskIds ) ) {
if ( ! TaskListMetadata . taskIdsIsEmpty ( taskIds ) ) {
Node root = AstridOrderedListUpdater . buildTreeModel ( taskIds , null ) ;
Node root = AstridOrderedListUpdater . buildTreeModel ( taskIds , null ) ;
SubtasksHelper . remapTree ( root , uuidTaskMap , new TreeRemapHelper < String > ( ) {
SubtasksHelper . remapTree ( root , uuidTaskMap , new TreeRemapHelper < String > ( ) {
public String getKeyFrom Uuid( String uuid ) {
public String getKeyFrom Old Uuid( String uuid ) {
return uuid TaskMap. get ( uuid ) ;
return uuid ; // Old uuids are the keys
}
}
} ) ;
} ) ;
taskIds = AstridOrderedListUpdater . serializeTree ( root ) ;
taskIds = AstridOrderedListUpdater . serializeTree ( root ) ;
tlm . setValue ( TaskListMetadata . TASK_IDS , taskIds ) ;
tlm . setValue ( TaskListMetadata . TASK_IDS , taskIds ) ;
}
}
taskListMetadataDao . saveExisting ( tlm ) ;
}
}
} finally {
} finally {
tlmCursor . close ( ) ;
tlmCursor . close ( ) ;
@ -805,7 +807,7 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
}
}
@SuppressWarnings ( "nls" )
@SuppressWarnings ( "nls" )
private void finishSignIn ( JSONObject result , String token ) {
private void finishSignIn ( JSONObject result , String token , boolean restart ) {
actFmPreferenceService . setToken ( token ) ;
actFmPreferenceService . setToken ( token ) ;
Preferences . setLong ( ActFmPreferenceService . PREF_USER_ID ,
Preferences . setLong ( ActFmPreferenceService . PREF_USER_ID ,
@ -825,15 +827,21 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
ActFmPreferenceService . reloadThisUser ( ) ;
ActFmPreferenceService . reloadThisUser ( ) ;
ActFmSyncMonitor monitor = ActFmSyncMonitor . getInstance ( ) ;
GCMIntentService . register ( this ) ;
synchronized ( monitor ) {
monitor . notifyAll ( ) ;
}
if ( restart ) {
System . exit ( 0 ) ;
return ;
} else {
setResult ( RESULT_OK ) ;
setResult ( RESULT_OK ) ;
finish ( ) ;
finish ( ) ;
}
GCMIntentService . register ( this ) ;
ActFmSyncMonitor monitor = ActFmSyncMonitor . getInstance ( ) ;
synchronized ( monitor ) {
monitor . notifyAll ( ) ;
}
}
}
@SuppressWarnings ( "nls" )
@SuppressWarnings ( "nls" )