Skip to content

Commit a607f4d

Browse files
author
ArchieMeng
committed
fix crashes when Application try to restore database
1 parent e5fdd90 commit a607f4d

File tree

4 files changed

+27
-7
lines changed

4 files changed

+27
-7
lines changed

mobile/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
minSdkVersion 19
99
targetSdkVersion 25
1010
versionCode 30
11-
versionName "2.3.2b"
11+
versionName "2.3.4b"
1212
resConfigs "en", "zh_cn", "zh_tw"
1313
}
1414
buildTypes {

mobile/src/main/java/info/papdt/express/helper/ui/MainActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public class MainActivity extends AbsActivity implements OnMenuTabClickListener
3636
private BottomBar mBottomBar;
3737
private BaseFragment[] fragments;
3838

39+
private final String TAG = "express.MainActivity";
40+
3941
private PackageDatabase mDatabase;
4042

4143
public static final int REQUEST_ADD = 10001, RESULT_NEW_PACKAGE = 2000, REQUEST_DETAILS = 10002, RESULT_DELETED = 2001, RESULT_RENAMED = 2002;
@@ -44,6 +46,7 @@ public class MainActivity extends AbsActivity implements OnMenuTabClickListener
4446

4547
@Override
4648
protected void onCreate(Bundle savedInstanceState) {
49+
Log.i(TAG, "MainActivity launch");
4750
super.onCreate(savedInstanceState);
4851

4952
if (getSettings().getBoolean(Settings.KEY_NAVIGATION_TINT, true)

mobile/src/main/java/info/papdt/express/helper/ui/SplashActivity.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import info.papdt.express.helper.ui.common.AbsActivity;
2121

2222
public class SplashActivity extends AbsActivity {
23-
private String TAG = "express.SplashActivity";
23+
private final String TAG = "express.SplashActivity";
2424
private ImageView mLogoView;
2525
private AppCompatTextView mTitleView;
2626
/**
@@ -31,6 +31,7 @@ public class SplashActivity extends AbsActivity {
3131

3232
@Override
3333
protected void onCreate(Bundle savedInstanceState) {
34+
Log.i(TAG, "SplashActivity launch");
3435
super.onCreate(savedInstanceState);
3536
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
3637
getWindow().getDecorView().setSystemUiVisibility(
@@ -64,8 +65,8 @@ protected void setUpViews() {
6465
mLogoView = $(R.id.iv_logo);
6566
mTitleView = $(R.id.tv_title);
6667

67-
MaterialImageLoader.animate(mLogoView).setDuration(1500).start();
68-
mTitleView.animate().alpha(1f).setDuration(600).start();
68+
MaterialImageLoader.animate(mLogoView).setDuration(1000).start();
69+
mTitleView.animate().alpha(1f).setDuration(500).start();
6970
}
7071

7172
/**

mobile/src/main/java/info/papdt/express/helper/ui/fragment/home/BaseFragment.java

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package info.papdt.express.helper.ui.fragment.home;
22

3+
import android.app.Activity;
4+
import android.content.Context;
35
import android.os.AsyncTask;
46
import android.os.Bundle;
57
import android.os.Handler;
@@ -32,7 +34,7 @@ public abstract class BaseFragment extends AbsFragment implements SwipeRefreshLa
3234
private RecyclerViewSwipeManager mSwipeManager;
3335

3436
private PackageDatabase mDatabase;
35-
37+
private static Context sInstance = null;
3638
private final static int FLAG_REFRESH_LIST = 0, FLAG_UPDATE_ADAPTER_ONLY = 1;
3739

3840
int eggCount = 0, bigEggCount = 0;
@@ -41,8 +43,22 @@ public BaseFragment(PackageDatabase database) {
4143
this.mDatabase = database;
4244
}
4345

44-
public BaseFragment() {
45-
this.mDatabase = PackageDatabase.getInstance(getContext());
46+
public BaseFragment(){
47+
super();
48+
}
49+
50+
// official method to get Activity Context
51+
@Override
52+
public void onAttach(Activity activity) {
53+
super.onAttach(activity);
54+
sInstance = activity;
55+
}
56+
57+
// restore database to reconstruct express info
58+
@Override
59+
public void onCreate(Bundle savedInstanceState) {
60+
super.onCreate(savedInstanceState);
61+
this.mDatabase = PackageDatabase.getInstance(sInstance);
4662
}
4763

4864
@Override

0 commit comments

Comments
 (0)