Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added ABCore.zip
Binary file not shown.
7 changes: 7 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

<application
android:allowBackup="false"
Expand Down Expand Up @@ -67,6 +68,12 @@
android:name=".DownloadActivity"
android:label="@string/title_activity_download"/>

<receiver android:name=".RebootBroadcastReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>

<receiver android:name=".PowerBroadcastReceiver">
<intent-filter>
<action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>
Expand Down
26 changes: 22 additions & 4 deletions app/src/main/java/com/greenaddress/abcore/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
Expand All @@ -25,13 +24,15 @@
import android.widget.Switch;
import android.widget.TextView;
import android.widget.Toast;
import android.os.Handler;

import com.google.zxing.WriterException;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.google.zxing.qrcode.encoder.ByteMatrix;
import com.google.zxing.qrcode.encoder.Encoder;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;


public class MainActivity extends AppCompatActivity {
private final static String TAG = MainActivity.class.getName();
Expand Down Expand Up @@ -145,11 +146,11 @@ protected void onCreate(final Bundle savedInstanceState) {
mQrCodeText = findViewById(R.id.textViewQr);
mImageViewQr = findViewById(R.id.qrcodeImageView);
setSupportActionBar(toolbar);


final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
final String useDistribution = prefs.getString("usedistribution", "core");
final String daemonVersion = "knots".equals(useDistribution) ? Packages.BITCOIN_KNOTS_NDK : "liquid".equals(useDistribution) ? Packages.BITCOIN_LIQUID_NDK : Packages.BITCOIN_NDK;

getSupportActionBar().setTitle(R.string.title_activity_main);
getSupportActionBar().setSubtitle(getString(R.string.subtitle, useDistribution));
mTvDaemon.setText(getString(R.string.subtitle, useDistribution + " " + daemonVersion));
Expand All @@ -169,6 +170,23 @@ public void onClick(final View v) {
daemonStatus = DaemonStatus.UNKNOWN;
mTvStatus.setText(getString(R.string.status_header, daemonStatus.toString()));
mSwitchCore.setText(R.string.switchcoreon);

boolean restart = prefs.getBoolean("restartOnBoot", false);
if(restart){
// Add 30 sec delay
autoRestart();
}
}

public void autoRestart(){
final Handler handler = new Handler();
Runnable task = new Runnable() {
@Override
public void run() {
mSwitchCore.setChecked(true);
}
};
handler.postDelayed(task, 30000);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.greenaddress.abcore;

import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;

public class RebootBroadcastReceiver extends BroadcastReceiver {

private static final String TAG = "RebootBroadcastReceiver";
@Override
public void onReceive(Context context, Intent intent) {

final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean restart = prefs.getBoolean("restartOnBoot", false);

if(restart){
Intent myIntent = new Intent(context, MainActivity.class);
myIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(myIntent);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@
import android.util.Log;
import android.view.MenuItem;

import androidx.appcompat.app.ActionBar;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.List;
import java.util.Properties;

import androidx.appcompat.app.ActionBar;
/**
* A {@link PreferenceActivity} that presents a set of application settings. On
* handset devices, settings are presented as a single list. On tablets,
Expand Down Expand Up @@ -116,11 +115,13 @@ public void onCreate(final Bundle savedInstanceState) {

final Properties p = new Properties();
try {

p.load(new FileInputStream(Utils.getBitcoinConf(getActivity())));

final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
final SharedPreferences.Editor e = prefs.edit();

e.putBoolean("restartOnBoot", p.getProperty("restartOnBoot", "0").equals("1"));
e.putBoolean("testnet", p.getProperty("testnet", "0").equals("1"));
e.putBoolean("upnp", p.getProperty("upnp", "0").equals("1"));
e.putBoolean("blocksonly", p.getProperty("blocksonly", "0").equals("1"));
Expand Down Expand Up @@ -155,6 +156,7 @@ public boolean onPreferenceChange(final Preference preference, final Object newV
findPreference("upnp").setOnPreferenceChangeListener(ps);
findPreference("blocksonly").setOnPreferenceChangeListener(ps);
findPreference("disablewallet").setOnPreferenceChangeListener(ps);
findPreference("restartOnBoot").setOnPreferenceChangeListener(ps);
findPreference("datadir").setSummary(p.getProperty("datadir", Utils.getDataDir(getActivity())));
findPreference("prune").setSummary(p.getProperty("prune", "1000"));
findPreference("prune").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/xml/pref_conf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

<CheckBoxPreference android:title="Pruning" android:key="pruning" android:defaultValue="true"/>
<CheckBoxPreference android:title="Blocks only" android:key="blocksonly" android:defaultValue="true"/>
<CheckBoxPreference android:title="Restart on Boot" android:key="restartOnBoot" android:defaultValue="false"/>

<EditTextPreference android:inputType="number" android:title="Pruning MB" android:key="prune" android:defaultValue="1000" android:dependency="pruning"/>

Expand Down