bitmessage/Abit
bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Regularly call cleanup()

Browse Source
This commit is contained in:
Christian Basler 2017-04-22 07:42:20 +02:00
parent d3f1e6abd2
commit d704a40b66
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -39,7 +39,7 @@ android {
//ext.jabitVersion = '2.0.4' //ext.jabitVersion = '2.0.4'
ext.jabitVersion = 'feature-extended-encoding-SNAPSHOT' ext.jabitVersion = 'feature-extended-encoding-SNAPSHOT'
ext.supportVersion = '25.2.0' ext.supportVersion = '25.3.1'
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
@ -63,9 +63,9 @@ dependencies {
compile('com.mikepenz:aboutlibraries:5.9.5@aar') { compile('com.mikepenz:aboutlibraries:5.9.5@aar') {
transitive = true transitive = true
} }
compile "com.mikepenz:iconics-core:2.8.2@aar" compile "com.mikepenz:iconics-core:2.8.3@aar"
compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar' compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar'
compile 'com.mikepenz:community-material-typeface:1.8.36.1@aar' compile 'com.mikepenz:community-material-typeface:1.9.32.1@aar'
compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar' compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar'
compile 'com.google.zxing:core:3.3.0' compile 'com.google.zxing:core:3.3.0'

3
app/src/main/java/ch/dissem/apps/abit/dialog/SelectEncodingDialogFragment.java
View File

@ -46,8 +46,7 @@ public class SelectEncodingDialogFragment extends AppCompatDialogFragment {
@Nullable @Nullable
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
savedInstanceState) {
if (getArguments() != null && getArguments().containsKey(EXTRA_ENCODING)) { if (getArguments() != null && getArguments().containsKey(EXTRA_ENCODING)) {
encoding = (Plaintext.Encoding) getArguments().getSerializable(EXTRA_ENCODING); encoding = (Plaintext.Encoding) getArguments().getSerializable(EXTRA_ENCODING);
} }

15
app/src/main/java/ch/dissem/apps/abit/service/BitmessageService.java
View File

@ -18,6 +18,7 @@ package ch.dissem.apps.abit.service;
import android.app.Service; import android.app.Service;
import android.content.Intent; import android.content.Intent;
import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
@ -38,6 +39,17 @@ public class BitmessageService extends Service {
private NetworkNotification notification = null; private NetworkNotification notification = null;
private final Handler cleanupHandler = new Handler();
private final Runnable cleanupTask = new Runnable() {
@Override
public void run() {
bmc.cleanup();
if (isRunning()) {
cleanupHandler.postDelayed(this, 24 * 60 * 60 * 1000L);
}
}
};
public static boolean isRunning() { public static boolean isRunning() {
return running && bmc.isRunning(); return running && bmc.isRunning();
} }
@ -61,6 +73,7 @@ public class BitmessageService extends Service {
bmc.startup(); bmc.startup();
} }
notification.show(); notification.show();
cleanupHandler.postDelayed(cleanupTask, 24 * 60 * 60 * 1000L);
} }
return Service.START_STICKY; return Service.START_STICKY;
} }
@ -72,6 +85,8 @@ public class BitmessageService extends Service {
} }
running = false; running = false;
notification.showShutdown(); notification.showShutdown();
cleanupHandler.removeCallbacks(cleanupTask);
bmc.cleanup();
stopSelf(); stopSelf();
} }