Rename bitcoin to palladium in android components
Update package names, intent filters and references from org.electrum to org.palladium
This commit is contained in:
@@ -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
|
#android.ouya.icon.filename = %(source.dir)s/data/ouya_icon.png
|
||||||
|
|
||||||
# (str) XML file to include as an intent filters in <activity> tag
|
# (str) XML file to include as an intent filters in <activity> 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
|
# (str) launchMode to set for the main activity
|
||||||
android.manifest.launch_mode = singleTask
|
android.manifest.launch_mode = singleTask
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
<action android:name="android.nfc.action.NDEF_DISCOVERED"/>
|
<action android:name="android.nfc.action.NDEF_DISCOVERED"/>
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<category android:name="android.intent.category.BROWSABLE" />
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
<data android:scheme="bitcoin" />
|
<data android:scheme="palladium" />
|
||||||
<data android:scheme="lightning" />
|
<data android:scheme="lightning" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package org.electrum.qr;
|
package org.palladium.qr;
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
@@ -27,13 +27,13 @@ import de.markusfisch.android.zxingcpp.ZxingCpp.Result;
|
|||||||
import de.markusfisch.android.zxingcpp.ZxingCpp.ContentType;
|
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 {
|
public class SimpleScannerActivity extends Activity {
|
||||||
private static final int MY_PERMISSIONS_CAMERA = 1002;
|
private static final int MY_PERMISSIONS_CAMERA = 1002;
|
||||||
|
|
||||||
private BarcodeScannerView mScannerView = null;
|
private BarcodeScannerView mScannerView = null;
|
||||||
final String TAG = "org.electrum.qr.SimpleScannerActivity";
|
final String TAG = "org.palladium.qr.SimpleScannerActivity";
|
||||||
|
|
||||||
private boolean mAlreadyRequestedPermissions = false;
|
private boolean mAlreadyRequestedPermissions = false;
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ class QEQRScanner(QObject):
|
|||||||
if 'ANDROID_DATA' not in os.environ:
|
if 'ANDROID_DATA' not in os.environ:
|
||||||
self._scan_qr_non_android()
|
self._scan_qr_non_android()
|
||||||
return
|
return
|
||||||
jSimpleScannerActivity = autoclass("org.electrum.qr.SimpleScannerActivity")
|
jSimpleScannerActivity = autoclass("org.palladium.qr.SimpleScannerActivity")
|
||||||
intent = jIntent(jpythonActivity, jSimpleScannerActivity)
|
intent = jIntent(jpythonActivity, jSimpleScannerActivity)
|
||||||
intent.putExtra(jIntent.EXTRA_TEXT, jString(self._hint))
|
intent.putExtra(jIntent.EXTRA_TEXT, jString(self._hint))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user