agorise/crystal-wallet-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
henry 2018-03-27 21:54:36 -04:00
commit 6c5fd9de37
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/AndroidManifest.xml
View file

@ -15,6 +15,7 @@
android:configChanges="locale" android:configChanges="locale"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity android:name=".activities.IntroActivity" <activity android:name=".activities.IntroActivity"
android:noHistory="true"
android:theme="@style/AppTheme.NoActionBar"> android:theme="@style/AppTheme.NoActionBar">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@ -29,7 +30,8 @@
</activity> </activity>
<activity android:name=".activities.ImportSeedActivity" > <activity android:name=".activities.ImportSeedActivity" >
</activity> </activity>
<activity android:name=".activities.CreateSeedActivity" > <activity android:name=".activities.CreateSeedActivity"
android:noHistory="true">
</activity> </activity>
<activity android:name=".activities.SendTransactionActivity" > <activity android:name=".activities.SendTransactionActivity" >
</activity> </activity>
@ -37,9 +39,11 @@
</activity> </activity>
<activity android:name=".activities.CryptoCoinTransactionReceiptActivity" > <activity android:name=".activities.CryptoCoinTransactionReceiptActivity" >
</activity> </activity>
<activity android:name=".activities.BackupSeedActivity" > <activity android:name=".activities.BackupSeedActivity"
android:noHistory="true">
</activity> </activity>
<activity android:name=".activities.PinRequestActivity"> <activity android:name=".activities.PinRequestActivity"
android:noHistory="true">
</activity> </activity>
<activity <activity
android:name=".activities.SettingsActivity" android:name=".activities.SettingsActivity"

4
app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java
View file

@ -3,6 +3,7 @@ package cy.agorise.crystalwallet.activities;
import android.arch.lifecycle.LiveData; import android.arch.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import android.arch.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import android.arch.lifecycle.ViewModelProviders;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
@ -52,6 +53,7 @@ public class BackupSeedActivity extends AppCompatActivity {
@OnClick(R.id.btnOk) @OnClick(R.id.btnOk)
public void btnOkClick(){ public void btnOkClick(){
this.finish(); Intent intent = new Intent(this, IntroActivity.class);
startActivity(intent);
} }
} }