Bugfix: Generate screen is now scrollable (#84 )

* generate+detail screens made scrollable * new version
Bugfix: crashing on android 5 & 6 (new wallet, receive, ...) (#83 )
2025-09-02 15:53:04 +02:00 · 2017-09-23 22:26:12 +02:00 · 2017-09-23 18:23:41 +02:00 · 2017-09-23 14:16:30 +02:00
26 changed files with 230 additions and 221 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
    <ConfirmationsSetting value="0" id="Add" />
    <ConfirmationsSetting value="0" id="Remove" />
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
        applicationId "com.m2049r.xmrwallet"
        minSdkVersion 21
        targetSdkVersion 25
-        versionCode 14
-        versionName "0.8.0.1"
+        versionCode 17
+        versionName "0.8.0.4"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        externalNativeBuild {
            cmake {
--- a/app/src/main/cpp/monerujo.cpp
+++ b/app/src/main/cpp/monerujo.cpp
@@ -531,8 +531,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_setPassword(JNIEnv *env, jobject instance
 JNIEXPORT jstring JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_getAddressJ(JNIEnv *env, jobject instance) {
    Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
-    const char *address = wallet->address().c_str();
-    return env->NewStringUTF(address);
+    return env->NewStringUTF(wallet->address().c_str());
 }

 JNIEXPORT jstring JNICALL
--- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
@@ -75,13 +75,13 @@ public class LoginActivity extends AppCompatActivity

    @Override
    protected void onCreate(Bundle savedInstanceState) {
+        Log.d(TAG, "onCreate()");
        super.onCreate(savedInstanceState);
-        setContentView(R.layout.login_activity);
-        setContentView(R.layout.login_activity);
        if (savedInstanceState != null) {
-            return;
+            // we don't store anything ourselves
        }

+        setContentView(R.layout.login_activity);
        toolbar = (Toolbar) findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);

--- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -150,14 +150,16 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
    protected void onCreate(Bundle savedInstanceState) {
        Log.d(TAG, "onCreate()");
        super.onCreate(savedInstanceState);
-        setContentView(R.layout.wallet_activity);
        if (savedInstanceState != null) {
-            return;
+            // we don't store anything ourselves
        }

+        setContentView(R.layout.wallet_activity);
        toolbar = (Toolbar) findViewById(R.id.toolbar);
-        toolbar.setTitle(R.string.app_name);
        setSupportActionBar(toolbar);
+
+        toolbar.setTitle(R.string.app_name);
+
        boolean testnet = WalletManager.getInstance().isTestNet();
        if (testnet) {
            toolbar.setBackgroundResource(R.color.colorPrimaryDark);
--- a/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java
@@ -50,8 +50,6 @@ public class Wallet {
        ConnectionStatus_WrongVersion
    }

-    //public native long createWalletListenerJ();
-
    public native String getSeed();

    public native String getSeedLanguage();
@@ -68,11 +66,11 @@ public class Wallet {

    public native boolean setPassword(String password);

+    private String address = null;
+
    public String getAddress() {
-        String address = getAddressJ();
-        if (!Wallet.isAddressValid(address, WalletManager.getInstance().isTestNet())) {
-            // just die!
-            throw new IllegalStateException("Wallet returned invalid address!");
+        if (address == null) {
+            address = getAddressJ();
        }
        return address;
    }
--- a/app/src/main/res/layout/gen_fragment.xml
+++ b/app/src/main/res/layout/gen_fragment.xml
@@ -1,107 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">

    <LinearLayout
        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="2">
+        android:layout_height="match_parent"
+        android:orientation="vertical">

-        <EditText
-            android:id="@+id/etWalletName"
-            style="@style/MoneroEdit"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:hint="@string/generate_name_hint"
-            android:imeOptions="actionNext"
-            android:inputType="text"
-            android:maxLines="1"
-            android:textAlignment="center" />
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <EditText
+                android:id="@+id/etWalletName"
+                style="@style/MoneroEdit"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:hint="@string/generate_name_hint"
+                android:imeOptions="actionNext"
+                android:inputType="text"
+                android:maxLines="1"
+                android:textAlignment="center" />
+
+            <EditText
+                android:id="@+id/etWalletPassword"
+                style="@style/MoneroEdit"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:hint="@string/generate_password_hint"
+                android:imeOptions="actionNext"
+                android:inputType="text"
+                android:textAlignment="center" />
+        </LinearLayout>

        <EditText
-            android:id="@+id/etWalletPassword"
-            style="@style/MoneroEdit"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:hint="@string/generate_password_hint"
-            android:imeOptions="actionNext"
-            android:inputType="text"
-            android:textAlignment="center" />
-    </LinearLayout>
-
-    <EditText
-        android:id="@+id/etWalletMnemonic"
-        style="@style/MoneroEdit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/generate_mnemonic_hint"
-        android:imeOptions="actionNext"
-        android:inputType="textMultiLine"
-        android:textAlignment="center" />
-
-    <EditText
-        android:id="@+id/etWalletAddress"
-        style="@style/MoneroEdit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/generate_address_hint"
-        android:imeOptions="actionNext"
-        android:inputType="textMultiLine"
-        android:textAlignment="center" />
-
-    <LinearLayout
-        android:id="@+id/llRestoreKeys"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <EditText
-            android:id="@+id/etWalletViewKey"
+            android:id="@+id/etWalletMnemonic"
            style="@style/MoneroEdit"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:hint="@string/generate_viewkey_hint"
+            android:hint="@string/generate_mnemonic_hint"
            android:imeOptions="actionNext"
            android:inputType="textMultiLine"
            android:textAlignment="center" />

        <EditText
-            android:id="@+id/etWalletSpendKey"
+            android:id="@+id/etWalletAddress"
            style="@style/MoneroEdit"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:hint="@string/generate_spendkey_hint"
+            android:hint="@string/generate_address_hint"
            android:imeOptions="actionNext"
            android:inputType="textMultiLine"
-            android:textAlignment="center"/>
+            android:textAlignment="center" />
+
+        <LinearLayout
+            android:id="@+id/llRestoreKeys"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <EditText
+                android:id="@+id/etWalletViewKey"
+                style="@style/MoneroEdit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/generate_viewkey_hint"
+                android:imeOptions="actionNext"
+                android:inputType="textMultiLine"
+                android:textAlignment="center" />
+
+            <EditText
+                android:id="@+id/etWalletSpendKey"
+                style="@style/MoneroEdit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/generate_spendkey_hint"
+                android:imeOptions="actionNext"
+                android:inputType="textMultiLine"
+                android:textAlignment="center" />
+        </LinearLayout>
+
+        <EditText
+            android:id="@+id/etWalletRestoreHeight"
+            style="@style/MoneroEdit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/generate_restoreheight_hint"
+            android:imeOptions="actionDone"
+            android:inputType="number"
+            android:textAlignment="center"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/bGenerate"
+            style="@style/MoneroButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginTop="8dp"
+            android:enabled="false"
+            android:text="@string/generate_buttonGenerate" />
+
    </LinearLayout>
-
-    <EditText
-        android:id="@+id/etWalletRestoreHeight"
-        style="@style/MoneroEdit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/generate_restoreheight_hint"
-        android:imeOptions="actionDone"
-        android:inputType="number"
-        android:textAlignment="center"
-        android:visibility="gone" />
-
-    <Button
-        android:id="@+id/bGenerate"
-        style="@style/MoneroButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginTop="8dp"
-        android:enabled="false"
-        android:text="@string/generate_buttonGenerate" />
-
-</LinearLayout>
+</ScrollView>
--- a/app/src/main/res/layout/gen_review_fragment.xml
+++ b/app/src/main/res/layout/gen_review_fragment.xml
--- a/external-libs/monero/lib/armeabi-v7a/libblockchain_db.a
+++ b/external-libs/monero/lib/armeabi-v7a/libblockchain_db.a
--- a/external-libs/monero/lib/armeabi-v7a/libblocks.a
+++ b/external-libs/monero/lib/armeabi-v7a/libblocks.a
--- a/external-libs/monero/lib/armeabi-v7a/libcncrypto.a
+++ b/external-libs/monero/lib/armeabi-v7a/libcncrypto.a
--- a/external-libs/monero/lib/armeabi-v7a/libcommon.a
+++ b/external-libs/monero/lib/armeabi-v7a/libcommon.a
--- a/external-libs/monero/lib/armeabi-v7a/libcryptonote_basic.a
+++ b/external-libs/monero/lib/armeabi-v7a/libcryptonote_basic.a
--- a/external-libs/monero/lib/armeabi-v7a/libcryptonote_core.a
+++ b/external-libs/monero/lib/armeabi-v7a/libcryptonote_core.a
--- a/external-libs/monero/lib/armeabi-v7a/libcryptonote_protocol.a
+++ b/external-libs/monero/lib/armeabi-v7a/libcryptonote_protocol.a
--- a/external-libs/monero/lib/armeabi-v7a/libdaemonizer.a
+++ b/external-libs/monero/lib/armeabi-v7a/libdaemonizer.a
--- a/external-libs/monero/lib/armeabi-v7a/libeasylogging.a
+++ b/external-libs/monero/lib/armeabi-v7a/libeasylogging.a
--- a/external-libs/monero/lib/armeabi-v7a/libepee.a
+++ b/external-libs/monero/lib/armeabi-v7a/libepee.a
--- a/external-libs/monero/lib/armeabi-v7a/liblmdb.a
+++ b/external-libs/monero/lib/armeabi-v7a/liblmdb.a
--- a/external-libs/monero/lib/armeabi-v7a/libminiupnpc.a
+++ b/external-libs/monero/lib/armeabi-v7a/libminiupnpc.a
--- a/external-libs/monero/lib/armeabi-v7a/libmnemonics.a
+++ b/external-libs/monero/lib/armeabi-v7a/libmnemonics.a
--- a/external-libs/monero/lib/armeabi-v7a/libp2p.a
+++ b/external-libs/monero/lib/armeabi-v7a/libp2p.a
--- a/external-libs/monero/lib/armeabi-v7a/libringct.a
+++ b/external-libs/monero/lib/armeabi-v7a/libringct.a
--- a/external-libs/monero/lib/armeabi-v7a/librpc.a
+++ b/external-libs/monero/lib/armeabi-v7a/librpc.a
--- a/external-libs/monero/lib/armeabi-v7a/libunbound.a
+++ b/external-libs/monero/lib/armeabi-v7a/libunbound.a
--- a/external-libs/monero/lib/armeabi-v7a/libwallet.a
+++ b/external-libs/monero/lib/armeabi-v7a/libwallet.a
Author	SHA1	Message	Date
m2049r	6678222202	Bugfix: Generate screen is now scrollable (#84 ) * generate+detail screens made scrollable * new version	2017-09-23 22:26:12 +02:00
m2049r	793d984200	Bugfix: crashing on android 5 & 6 (new wallet, receive, ...) (#83 ) * getAddress() mess fixed * v0.8.0.3	2017-09-23 18:23:41 +02:00
m2049r	cc46dc06c4	Bugfixes (#82 ) * cache getAddress() * savedInstanceState handling * v0.8.0.2	2017-09-23 14:16:30 +02:00