diff --git a/app/src/main/java/eu/faircode/netguard/ActivityPro.java b/app/src/main/java/eu/faircode/netguard/ActivityPro.java index 38e1572a..5abbd598 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityPro.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityPro.java @@ -69,16 +69,6 @@ public class ActivityPro extends AppCompatActivity { getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); - // Trial - long now = new Date().getTime(); - long trial = IAB.getTrialEnd(this); - TextView tvTrial = (TextView) findViewById(R.id.tvTrial); - if (now < trial) { - DateFormat df = SimpleDateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); - tvTrial.setText(getString(R.string.title_pro_trial_until, df.format(trial))); - } else - tvTrial.setText(getString(R.string.title_pro_trial_ended)); - // Initial state updateState(); @@ -171,6 +161,17 @@ public class ActivityPro extends AppCompatActivity { Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex)); Util.sendCrashReport(ex, ActivityPro.this); } + + // Trial + long now = new Date().getTime(); + long trial = IAB.getTrialEnd(this); + TextView tvTrial = (TextView) findViewById(R.id.tvTrial); + if (now < trial) { + DateFormat df = SimpleDateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); + tvTrial.setText(getString(R.string.title_pro_trial_until, df.format(trial))); + } else + tvTrial.setText(getString(R.string.title_pro_trial_ended)); + } @Override diff --git a/app/src/main/res/layout/pro.xml b/app/src/main/res/layout/pro.xml index 5a96d79c..c2776809 100644 --- a/app/src/main/res/layout/pro.xml +++ b/app/src/main/res/layout/pro.xml @@ -16,15 +16,8 @@ android:orientation="vertical"> - - @@ -242,6 +235,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> + + \ No newline at end of file