Minor bugfixes
This commit is contained in:
parent
8af8419b7c
commit
8057980f6c
@ -20,7 +20,6 @@ android {
|
|||||||
targetSdkVersion 25
|
targetSdkVersion 25
|
||||||
versionCode 13
|
versionCode 13
|
||||||
versionName "1.0-beta13"
|
versionName "1.0-beta13"
|
||||||
jackOptions.enabled = false
|
|
||||||
multiDexEnabled true
|
multiDexEnabled true
|
||||||
}
|
}
|
||||||
compileOptions {
|
compileOptions {
|
||||||
@ -38,7 +37,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//ext.jabitVersion = '2.0.4'
|
//ext.jabitVersion = '2.0.4'
|
||||||
ext.jabitVersion = 'development-SNAPSHOT'
|
ext.jabitVersion = 'feature-exports-SNAPSHOT'
|
||||||
ext.supportVersion = '25.3.1'
|
ext.supportVersion = '25.3.1'
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
@ -54,6 +53,7 @@ dependencies {
|
|||||||
compile "ch.dissem.jabit:jabit-cryptography-spongy:$jabitVersion"
|
compile "ch.dissem.jabit:jabit-cryptography-spongy:$jabitVersion"
|
||||||
compile "ch.dissem.jabit:jabit-extensions:$jabitVersion"
|
compile "ch.dissem.jabit:jabit-extensions:$jabitVersion"
|
||||||
compile "ch.dissem.jabit:jabit-wif:$jabitVersion"
|
compile "ch.dissem.jabit:jabit-wif:$jabitVersion"
|
||||||
|
compile "ch.dissem.jabit:jabit-exports:$jabitVersion"
|
||||||
|
|
||||||
compile 'org.slf4j:slf4j-android:1.7.25'
|
compile 'org.slf4j:slf4j-android:1.7.25'
|
||||||
|
|
||||||
@ -71,7 +71,7 @@ dependencies {
|
|||||||
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'
|
||||||
|
|
||||||
compile 'io.github.yavski:fab-speed-dial:1.0.6'
|
compile 'io.github.yavski:fab-speed-dial:1.0.7'
|
||||||
compile 'com.github.amlcurran.showcaseview:library:5.4.3'
|
compile 'com.github.amlcurran.showcaseview:library:5.4.3'
|
||||||
compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.4@aar') {
|
compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.4@aar') {
|
||||||
transitive = true
|
transitive = true
|
||||||
@ -80,7 +80,7 @@ dependencies {
|
|||||||
compile 'com.android.support.constraint:constraint-layout:1.0.2'
|
compile 'com.android.support.constraint:constraint-layout:1.0.2'
|
||||||
|
|
||||||
testCompile 'junit:junit:4.12'
|
testCompile 'junit:junit:4.12'
|
||||||
testCompile 'org.mockito:mockito-core:2.7.22'
|
testCompile 'org.mockito:mockito-core:2.8.9'
|
||||||
}
|
}
|
||||||
|
|
||||||
idea.module {
|
idea.module {
|
||||||
|
@ -219,6 +219,10 @@ public class ComposeMessageFragment extends Fragment {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (recipient == null){
|
||||||
|
Toast.makeText(getContext(), R.string.error_msg_recipient_missing, Toast.LENGTH_LONG).show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
builder = new Plaintext.Builder(MSG)
|
builder = new Plaintext.Builder(MSG)
|
||||||
.from(identity)
|
.from(identity)
|
||||||
.to(recipient);
|
.to(recipient);
|
||||||
|
@ -35,7 +35,7 @@ public class WifiReceiver extends BroadcastReceiver {
|
|||||||
if (Preferences.isWifiOnly(ctx) && isConnectedToMeteredNetwork(ctx) && bmc.isRunning()) {
|
if (Preferences.isWifiOnly(ctx) && isConnectedToMeteredNetwork(ctx) && bmc.isRunning()) {
|
||||||
bmc.shutdown();
|
bmc.shutdown();
|
||||||
}
|
}
|
||||||
if (!bmc.isRunning() && !(Preferences.isWifiOnly(ctx) && isConnectedToMeteredNetwork(ctx))) {
|
if (Preferences.isFullNodeActive(ctx) && !bmc.isRunning() && !(Preferences.isWifiOnly(ctx) && isConnectedToMeteredNetwork(ctx))) {
|
||||||
ctx.startService(new Intent(ctx, BitmessageService.class));
|
ctx.startService(new Intent(ctx, BitmessageService.class));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -100,7 +100,8 @@ public class SyncAdapter extends AbstractThreadedSyncAdapter {
|
|||||||
Preferences.getTrustedNode(getContext()),
|
Preferences.getTrustedNode(getContext()),
|
||||||
Preferences.getTrustedNodePort(getContext()),
|
Preferences.getTrustedNodePort(getContext()),
|
||||||
Preferences.getTimeoutInSeconds(getContext()),
|
Preferences.getTimeoutInSeconds(getContext()),
|
||||||
true);
|
true
|
||||||
|
);
|
||||||
LOG.info("Synchronization finished");
|
LOG.info("Synchronization finished");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -118,4 +118,5 @@ Als Alternative kann in den Einstellungen ein vertrauenswürdiger Knoten konfigu
|
|||||||
<string name="cleanup_notification_end">Aufräumarbeiten beendet</string>
|
<string name="cleanup_notification_end">Aufräumarbeiten beendet</string>
|
||||||
<string name="cleanup_summary">Veraltete Inventareinträge werden entfernt</string>
|
<string name="cleanup_summary">Veraltete Inventareinträge werden entfernt</string>
|
||||||
<string name="wait_for_wifi">Auf W-LAN warten</string>
|
<string name="wait_for_wifi">Auf W-LAN warten</string>
|
||||||
|
<string name="error_msg_recipient_missing">Bitte Empfänger angeben</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -117,4 +117,5 @@ As an alternative you could configure a trusted node in the settings, but as of
|
|||||||
<string name="cleanup_notification_start">Cleanup started</string>
|
<string name="cleanup_notification_start">Cleanup started</string>
|
||||||
<string name="cleanup_notification_end">Cleanup finished</string>
|
<string name="cleanup_notification_end">Cleanup finished</string>
|
||||||
<string name="wait_for_wifi">Wait for Wi-Fi</string>
|
<string name="wait_for_wifi">Wait for Wi-Fi</string>
|
||||||
|
<string name="error_msg_recipient_missing">Please set a recipient</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -10,7 +10,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:2.3.3'
|
classpath 'com.android.tools.build:gradle:2.3.3'
|
||||||
classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
|
classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
Loading…
Reference in New Issue
Block a user