awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

finish WelcomeActivity and RegistrationActivity on successfull registration

Browse Source
This commit is contained in:
B. Petersen
2018-08-31 01:46:08 +02:00
parent 12c5de9020
commit 4a32ecbb47
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/RegistrationActivity.java
+1 -1
View File
@@ -241,7 +241,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
public void handleEvent(int eventId, Object data1, Object data2) {
if (eventId==DcContext.DC_EVENT_CONFIGURE_PROGRESS) {
long progress = (Long)data1;
Log.i("DeltaChat", String.format("configure-progress=%d", (int)progress));
if (progress==0/*error/aborted*/) {
progressDialog.dismiss();
}
@@ -252,6 +251,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
progressDialog.dismiss();
Intent conversationList = new Intent(getApplicationContext(), ConversationListActivity.class);
startActivity(conversationList);
finish();
}
}
}
src/org/thoughtcrime/securesms/WelcomeActivity.java
+21 -2
View File
@@ -16,6 +16,10 @@ import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import com.b44t.messenger.DcContext;
import com.b44t.messenger.DcEventCenter;
import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.permissions.Permissions;
/**
@@ -24,7 +28,7 @@ import org.thoughtcrime.securesms.permissions.Permissions;
*
* @author Daniel Böhrs
*/
public class WelcomeActivity extends BaseActionBarActivity {
public class WelcomeActivity extends BaseActionBarActivity implements DcEventCenter.DcEventDelegate {
private class WelcomePagerAdapter extends PagerAdapter {
@@ -81,6 +85,13 @@ public class WelcomeActivity extends BaseActionBarActivity {
setContentView(R.layout.welcome_activity);
initializeResources();
DcHelper.getContext(this).eventCenter.addObserver(this, DcContext.DC_EVENT_CONFIGURE_PROGRESS);
}
@Override
public void onDestroy() {
super.onDestroy();
DcHelper.getContext(this).eventCenter.removeObservers(this);
}
@Override
@@ -104,7 +115,7 @@ public class WelcomeActivity extends BaseActionBarActivity {
private void startRegistrationActivity() {
Intent intent = new Intent(this, RegistrationActivity.class);
startActivity(intent);
finish();
// no finish() here, the back key should take the user back from RegistrationActivity to WelcomeActivity
}
@SuppressLint("InlinedApi")
@@ -120,4 +131,12 @@ public class WelcomeActivity extends BaseActionBarActivity {
.execute();
}
public void handleEvent(int eventId, Object data1, Object data2) {
if (eventId== DcContext.DC_EVENT_CONFIGURE_PROGRESS) {
long progress = (Long)data1;
if (progress==1000/*done*/) {
finish(); // remove ourself from the activity stack (finishAffinity is available in API 16, we're targeting API 14)
}
}
}
}