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

Fixed issues with new full node behaviour

Browse Source
This commit is contained in:
Christian Basler
2017-05-08 20:28:43 +02:00
parent 263fc8893f
commit 73944b5883
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ch/dissem/apps/abit/MainActivity.java
View File

@@ -387,8 +387,8 @@ public class MainActivity extends AppCompatActivity
@Override @Override
protected void onResume() { protected void onResume() {
updateUnread(); updateUnread();
if (Preferences.isFullNodeActive(this)){ if (Preferences.isFullNodeActive(this) && Preferences.isConnectionAllowed(MainActivity.this)) {
checkAndStartNode(); startService(new Intent(this, BitmessageService.class));
} }
updateNodeSwitch(); updateNodeSwitch();
Singleton.getMessageListener(this).resetNotification(); Singleton.getMessageListener(this).resetNotification();

2
app/src/main/java/ch/dissem/apps/abit/dialog/FullNodeDialogActivity.java
View File

@@ -35,7 +35,7 @@ public class FullNodeDialogActivity extends Activity {
findViewById(R.id.ok).setOnClickListener(new View.OnClickListener() { findViewById(R.id.ok).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Preferences.setWifiOnly(FullNodeDialogActivity.this, true); Preferences.setWifiOnly(FullNodeDialogActivity.this, false);
finish(); finish();
} }
}); });

4
app/src/main/java/ch/dissem/apps/abit/util/Drawables.java
View File

@@ -45,6 +45,7 @@ import static android.graphics.Color.BLACK;
import static android.graphics.Color.WHITE; import static android.graphics.Color.WHITE;
import static android.util.Base64.NO_WRAP; import static android.util.Base64.NO_WRAP;
import static android.util.Base64.URL_SAFE; import static android.util.Base64.URL_SAFE;
import static ch.dissem.apps.abit.util.Constants.BITMESSAGE_URL_SCHEMA;
/** /**
* Some helper methods to work with drawables. * Some helper methods to work with drawables.
@@ -73,7 +74,8 @@ public class Drawables {
} }
public static Bitmap qrCode(BitmessageAddress address) { public static Bitmap qrCode(BitmessageAddress address) {
StringBuilder link = new StringBuilder("bitmessage:"); StringBuilder link = new StringBuilder();
link.append(BITMESSAGE_URL_SCHEMA);
link.append(address.getAddress()); link.append(address.getAddress());
if (address.getAlias() != null) { if (address.getAlias() != null) {
link.append("?label=").append(address.getAlias()); link.append("?label=").append(address.getAlias());