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

The 'Back' button works in the welcome-screen as expected.

Browse Source
This commit is contained in:
B. Petersen
2017-10-08 14:01:37 +02:00
parent 7f14a4da90
commit 1455f7849b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessengerProj/src/main/java/com/b44t/ui/WelcomeActivity.java
+9 -4
View File
@@ -75,8 +75,9 @@ public class WelcomeActivity extends Activity implements NotificationCenter.Noti
Theme.loadRecources(this);
requestWindowFeature(Window.FEATURE_NO_TITLE);
NotificationCenter.getInstance().addObserver(this, NotificationCenter.imexEnded);
NotificationCenter.getInstance().addObserver(this, NotificationCenter.imexProgress);
NotificationCenter.getInstance().addObserver(this, NotificationCenter.imexEnded);
NotificationCenter.getInstance().addObserver(this, NotificationCenter.configureEnded);
Bundle extras = getIntent().getExtras();
if( extras != null && extras.getBoolean("com.b44t.ui.IntroActivity.isAbout") ) {
@@ -123,7 +124,6 @@ public class WelcomeActivity extends Activity implements NotificationCenter.Noti
Intent intent2 = new Intent(WelcomeActivity.this, LaunchActivity.class);
intent2.putExtra("fromIntro", true);
startActivity(intent2);
finish();
}
});
@@ -148,8 +148,9 @@ public class WelcomeActivity extends Activity implements NotificationCenter.Noti
@Override
protected void onDestroy() {
super.onDestroy();
NotificationCenter.getInstance().removeObserver(this, NotificationCenter.imexEnded);
NotificationCenter.getInstance().removeObserver(this, NotificationCenter.imexProgress);
NotificationCenter.getInstance().removeObserver(this, NotificationCenter.imexEnded);
NotificationCenter.getInstance().removeObserver(this, NotificationCenter.configureEnded);
}
private class IntroAdapter extends PagerAdapter {
@@ -262,7 +263,7 @@ public class WelcomeActivity extends Activity implements NotificationCenter.Noti
}
/* Specials for importing
/* Specials for importing and configuration
**********************************************************************************************/
@Override
@@ -381,5 +382,9 @@ public class WelcomeActivity extends Activity implements NotificationCenter.Noti
.show();
}
}
else if(id == NotificationCenter.configureEnded ) {
// no need to start a new activitiy, this is done in SettingsAccountActivity(), just close self
finish();
}
}
}