v0.9.109

app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 def versionMajor = 0
 def versionMinor = 9
-def magicNumber = 9 * 1000 + 1 * 100 // last number before apply automatic logic
+def magicNumber = 9 * 10000
 
 //TODO edit the changelog as well
 
@@ -14,7 +14,7 @@ android {
         targetSdkVersion 27
         // get rid from manual setting, and it prevents sometimes a nasty git push -f on master
         versionCode magicNumber + getGitCommitCount()
-        versionName "${versionMajor}.${versionMinor}" + (versionCode == 0 ? "" : ".${versionCode}") + "-" + getGitHash()
+        versionName "${versionMajor}.${versionMinor}" + (versionCode == 0 ? "" : ".${getGitCommitCount()}") + "-" + getGitHash()
         buildConfigField "String", "CI_BUILD_ID", "\"" + getBuildId() + "\""
         buildConfigField "String", "CI_BUILD_URL", "\"" + getBuildUrl() + "\""
         buildConfigField "String", "GIT_COMMIT_URL", "\"" + getGitCommitUrl() + "\""
@@ -93,7 +93,7 @@ dependencies {
     implementation 'org.knowm.xchange:xchange-okcoin:4.3.0'
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
-    implementation 'com.github.iotaledger:iota~lib~java:6c2df37'
+    implementation 'com.github.iotaledger:iota~lib~java:7613eb2'
 }
 
 static def getGitCommitCount() {

app/src/main/java/org/iota/wallet/api/handler/SendTransferRequestHandler.java

@@ -86,7 +86,7 @@ public ApiResponse handle(ApiRequest request) {
             }
 
             if (e instanceof ArgumentException) {
-                if (e.getMessage().contains("Sending to a used address.") || e.getMessage().contains("Private key reuse detect!")) {
+                if (e.getMessage().contains("Sending to a used address.") || e.getMessage().contains("Private key reuse detect!") || e.getMessage().contains("Send to inputs!")) {
                     final Activity activity = (Activity) context;
                     Bundle bundle = new Bundle();
                     bundle.putString("error", e.getMessage());

app/src/main/java/org/iota/wallet/ui/dialog/KeyReuseDetectedDialog.java

@@ -21,14 +21,13 @@
 
 import android.app.Dialog;
 import android.app.DialogFragment;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
 
 import org.iota.wallet.R;
 
-public class KeyReuseDetectedDialog extends DialogFragment implements DialogInterface.OnClickListener {
+public class KeyReuseDetectedDialog extends DialogFragment {
 
     public KeyReuseDetectedDialog() {
     }
@@ -50,24 +49,17 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
             } else if (error.contains("Private key reuse detect!")) {
                 title = getResources().getString(R.string.title_key_reuse_detect);
                 message = getResources().getString(R.string.message_key_reuse_detect);
+
+            } else if (error.contains("Send to inputs!")) {
+                title = getResources().getString(R.string.title_send_to_inputs);
+                message = getResources().getString(R.string.message_send_to_inputs);
             }
         }
 
         return new AlertDialog.Builder(getActivity(), R.style.AppCompatAlertDialogStyle)
                 .setTitle(title)
                 .setMessage(message)
-                .setCancelable(false)
-                .setPositiveButton(R.string.buttons_ok, null)
+                .setCancelable(true)
                 .create();
     }
-
-    @Override
-    public void onClick(DialogInterface dialogInterface, int which) {
-        switch (which) {
-            case AlertDialog.BUTTON_NEGATIVE:
-                getDialog().dismiss();
-                break;
-        }
-    }
-
 }

app/src/main/res/raw/changelog.xml

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog bulletedList="true">
 
+    <changelogversion
+        changeDate="December 16, 2017"
+        versionName="0.9.109">
+        <changelogtext>Added https support</changelogtext>
+        <changelogtext>Fixed send transfer</changelogtext>
+        <changelogtext>Updated translation</changelogtext>
+    </changelogversion>
+
     <changelogversion
         changeDate="December 11, 2017"
         versionName="0.9.3">

app/src/main/res/values-de/strings.xml

@@ -103,7 +103,7 @@
     <string name="notification_send_transfer_request_title">Überweisung wird gesendet</string>
     <string name="notification_generate_new_address_request_title">Adresse wird generiert</string>
     <string name="notification_attaching_new_address_request_title">Adresse wird angehangen</string>
-    <string name="notification_replay_bundle_request_title">Transfer wird wiederholt</string>
+    <string name="notification_replay_bundle_request_title">Transfer wird erneut angehnagen</string>
 
     <string name="notification_generating_new_address_response_succeeded_title">Neue Adresse generiert</string>
 
@@ -113,8 +113,8 @@
     <string name="notification_attaching_new_address_response_succeeded_title">Neue Adresse erfolgreich angehangen</string>
     <string name="notification_attaching_new_address_response_failed_title">Fehler beim anhängen der neuen Adresse</string>
 
-    <string name="notification_replay_bundle_response_succeeded_title">Wiederholung erfolgreich ausgeführt</string>
-    <string name="notification_replay_bundle_response_failed_title">Fehler beim wiederholen</string>
+    <string name="notification_replay_bundle_response_succeeded_title">Erneutes anhängen erfolgreich ausgeführt</string>
+    <string name="notification_replay_bundle_response_failed_title">Fehler beim erneuten anhängen</string>
 
     <string name="notification_address_attach_to_tangle_blocked_title">Fehler beim anhängen der neuen Adresse, bitte lokales PoW aktivieren</string>
     <string name="notification_transfer_attach_to_tangle_blocked_title">Überweisung fehlgeschlagen, bitte lokales PoW einschalten</string>
@@ -211,6 +211,8 @@
     <string name="message_spend_to_used_address">Sie versuchen eine Transaktion an eine Adresse zu senden, die bereits verwendet wurde (d. h. Token wurden bereits von dieser Adresse gesendet). Bitte fragen Sie den Empfänger nach einer neuen Adresse, die noch nicht für ausgehende Transaktionen benutzt wurde.</string>
     <string name="title_key_reuse_detect">Wiederverwendung des privaten Schlüssels erkannt!</string>
     <string name="message_key_reuse_detect">Sie versuchen eine Transaktion mit einer bereits verwendeten Adresse zu signieren. IOTA verwendet das  Winternitz-Einmalsignatur-Schema für einmalige Unterschrift (W-OTS). Aufgrund seiner Einmaligkeit sinkt die Sicherheit von Geldmitteln in einer Adresse schnell, wenn Sie neue Transaktionen mit demselben Schlüssel neu signieren. Bitte warten Sie, bis die vorherige Transaktion bestätigt wurde bevor eine weitere Transaktion gesendet wird. Durch erneutes anhängen der Transaktion bekommen Sie diese betätigt.</string>
+    <string name="title_send_to_inputs">An Eingaben Adresse senden!</string>
+    <string name="message_send_to_inputs">Es ist nicht möglich an die eigen Adresse zu senden!</string>
 
     <!-- Confirm transfer dialog -->
     <string name="message_confirm_transfer">Bist du sicher das die Überweisung senden willst?</string>

app/src/main/res/values/strings.xml

@@ -68,7 +68,7 @@
     <string name="messages_invalid_characters_seed">Your seed contains invalid characters. Only uppercase characters from A-Z and the number 9 are accepted.</string>
     <string name="messages_to_long_seed">Your seed should not contain more than 81 characters. Extra characters are ignored.</string>
     <string name="messages_to_short_seed">Your seed does not contain enough characters. This is not secure.</string>
-    <string name="messages_not_fully_synced_yet">The connected node ist not fully synced yet</string>
+    <string name="messages_not_fully_synced_yet">The connected node is not fully synced yet</string>
     <string name="messages_no_data_available">No data available</string>
     <string name="messages_not_yet_implemented">Not yet implemented</string>
     <string name="messages_enter_txaddress_with_checksum">Please enter a valid recipient address with checksum</string>
@@ -104,7 +104,7 @@
     <string name="notification_send_transfer_request_title">Sending transfer</string>
     <string name="notification_generate_new_address_request_title">Generating new address</string>
     <string name="notification_attaching_new_address_request_title">Attaching new address</string>
-    <string name="notification_replay_bundle_request_title">Replay bundle</string>
+    <string name="notification_replay_bundle_request_title">Reattaching</string>
 
     <string name="notification_generating_new_address_response_succeeded_title">New address generated</string>
 
@@ -114,8 +114,8 @@
     <string name="notification_attaching_new_address_response_succeeded_title">Attaching new address executed</string>
     <string name="notification_attaching_new_address_response_failed_title">Attaching new address failed</string>
     ´
-    <string name="notification_replay_bundle_response_succeeded_title">Replay executed</string>
-    <string name="notification_replay_bundle_response_failed_title">Replay failed</string>
+    <string name="notification_replay_bundle_response_succeeded_title">Reattach executed</string>
+    <string name="notification_replay_bundle_response_failed_title">Reattach failed</string>
 
     <string name="notification_address_attach_to_tangle_blocked_title">Attaching new address failed, please enable local PoW</string>
     <string name="notification_transfer_attach_to_tangle_blocked_title">Transaction failed, please enable local PoW</string>
@@ -214,6 +214,8 @@
     <string name="message_spend_to_used_address">You are attempting to send a transaction to an address that has already been used (i.e. tokens have already been spent from this address). Please ask recipient for a new address, that hasn\'t been spent from yet.</string>
     <string name="title_key_reuse_detect">Private Key Reuse Detected!</string>
     <string name="message_key_reuse_detect">You are attempting to sign a transaction with input that have an already been used. IOTA uses Winternitz one-time signature (W-OTS) scheme, due to it\'s one-time nature, the security of funds in an address decreases rapidly if you re-sign new transactions using the same key. Please wait for previous transaction to confirm, e.g. by reattaching, before sending another transaction.</string>
+    <string name="title_send_to_inputs">Send to inputs!</string>
+    <string name="message_send_to_inputs">It is not possible to send to the own address!</string>
 
     <!-- Confirm transfer dialog -->
     <string name="message_confirm_transfer">Are you sure you want to send the transfer?</string>