diff --git a/contrib/android/buildozer_qml.spec b/contrib/android/buildozer_qml.spec index 264a08add..e0f5ae361 100644 --- a/contrib/android/buildozer_qml.spec +++ b/contrib/android/buildozer_qml.spec @@ -197,7 +197,7 @@ android.add_resources = electrum/gui/qml/android_res/layout:layout #android.ouya.icon.filename = %(source.dir)s/data/ouya_icon.png # (str) XML file to include as an intent filters in tag -android.manifest.intent_filters = contrib/android/bitcoin_intent.xml +android.manifest.intent_filters = contrib/android/palladium_intent.xml # (str) launchMode to set for the main activity android.manifest.launch_mode = singleTask diff --git a/contrib/android/bitcoin_intent.xml b/contrib/android/palladium_intent.xml similarity index 89% rename from contrib/android/bitcoin_intent.xml rename to contrib/android/palladium_intent.xml index 87553b2c8..f5edd5398 100644 --- a/contrib/android/bitcoin_intent.xml +++ b/contrib/android/palladium_intent.xml @@ -3,6 +3,6 @@ - + diff --git a/electrum/gui/qml/java_classes/org/electrum/qr/SimpleScannerActivity.java b/electrum/gui/qml/java_classes/org/palladium/qr/SimpleScannerActivity.java similarity index 97% rename from electrum/gui/qml/java_classes/org/electrum/qr/SimpleScannerActivity.java rename to electrum/gui/qml/java_classes/org/palladium/qr/SimpleScannerActivity.java index d6db0973e..832d42286 100644 --- a/electrum/gui/qml/java_classes/org/electrum/qr/SimpleScannerActivity.java +++ b/electrum/gui/qml/java_classes/org/palladium/qr/SimpleScannerActivity.java @@ -1,4 +1,4 @@ -package org.electrum.qr; +package org.palladium.qr; import android.app.Activity; import android.os.Bundle; @@ -27,13 +27,13 @@ import de.markusfisch.android.zxingcpp.ZxingCpp.Result; import de.markusfisch.android.zxingcpp.ZxingCpp.ContentType; -import org.electrum.electrum.res.R; // package set in build.gradle +import org.palladium.pallectrum.res.R; // package set in build.gradle public class SimpleScannerActivity extends Activity { private static final int MY_PERMISSIONS_CAMERA = 1002; private BarcodeScannerView mScannerView = null; - final String TAG = "org.electrum.qr.SimpleScannerActivity"; + final String TAG = "org.palladium.qr.SimpleScannerActivity"; private boolean mAlreadyRequestedPermissions = false; diff --git a/electrum/gui/qml/qeqrscanner.py b/electrum/gui/qml/qeqrscanner.py index 297479ba8..8f8adcb7f 100644 --- a/electrum/gui/qml/qeqrscanner.py +++ b/electrum/gui/qml/qeqrscanner.py @@ -49,7 +49,7 @@ class QEQRScanner(QObject): if 'ANDROID_DATA' not in os.environ: self._scan_qr_non_android() return - jSimpleScannerActivity = autoclass("org.electrum.qr.SimpleScannerActivity") + jSimpleScannerActivity = autoclass("org.palladium.qr.SimpleScannerActivity") intent = jIntent(jpythonActivity, jSimpleScannerActivity) intent.putExtra(jIntent.EXTRA_TEXT, jString(self._hint))