From c0c126192f8bee6cde38622ff72aca79e1dc3062 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Fri, 22 Nov 2019 13:58:03 +0100
Subject: [PATCH 01/10] Improve note sizing

Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>
---
 app/src/main/res/layout/loyalty_card_view_layout.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/loyalty_card_view_layout.xml b/app/src/main/res/layout/loyalty_card_view_layout.xml
index 8fef9e8e2..097a1a898 100644
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -71,15 +71,16 @@
 
             <TextView
                 android:id="@id/noteView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
                 android:layout_margin="10.0dip"
-                android:ellipsize="end"
                 android:layout_gravity="bottom"
                 app:layout_constraintTop_toBottomOf="@id/noteViewDivider"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
                 app:autoSizeTextType="uniform"
                 app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
                 app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax"

From 28b3aa2018951a440de5649946562cdc2922e455 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 1 Dec 2019 18:22:55 +0100
Subject: [PATCH 02/10] Add ability to share and receive loyalty cards

---
 app/src/main/AndroidManifest.xml              |  12 ++-
 .../protect/card_locker/ImportURIHelper.java  |  77 ++++++++++++++++++
 .../card_locker/LoyaltyCardEditActivity.java  |  36 ++++++--
 .../card_locker/LoyaltyCardViewActivity.java  |   9 +-
 .../protect/card_locker/MainActivity.java     |  22 +++--
 .../main/res/drawable-hdpi/ic_share_white.png | Bin 0 -> 554 bytes
 .../main/res/drawable-mdpi/ic_share_white.png | Bin 0 -> 397 bytes
 .../res/drawable-xhdpi/ic_share_white.png     | Bin 0 -> 758 bytes
 .../res/drawable-xxhdpi/ic_share_white.png    | Bin 0 -> 1248 bytes
 app/src/main/res/menu/card_longclick_menu.xml |   4 +
 app/src/main/res/menu/card_view_menu.xml      |   5 ++
 app/src/main/res/values/strings.xml           |   7 ++
 12 files changed, 157 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/protect/card_locker/ImportURIHelper.java
 create mode 100644 app/src/main/res/drawable-hdpi/ic_share_white.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_share_white.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_share_white.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_share_white.png

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 18de61be0..1869a74d2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,7 +43,17 @@
             android:theme="@style/AppTheme.NoActionBar"
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden"
-            android:exported="true"/>
+            android:exported="true">
+            <intent-filter android:label="@string/intent_import_card_from_url">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <!-- Accepts URIs that begin with "https://github.com/brarcher/loyalty-card-locker/” -->
+                <data android:scheme="https"
+                    android:host="@string/intent_import_card_from_url_host"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".BarcodeSelectorActivity"
             android:label="@string/selectBarcodeTitle"
diff --git a/app/src/main/java/protect/card_locker/ImportURIHelper.java b/app/src/main/java/protect/card_locker/ImportURIHelper.java
new file mode 100644
index 000000000..18d76903f
--- /dev/null
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -0,0 +1,77 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import java.io.InvalidObjectException;
+import java.security.InvalidParameterException;
+
+public class ImportURIHelper {
+    private static final String STORE = DBHelper.LoyaltyCardDbIds.STORE;
+    private static final String NOTE = DBHelper.LoyaltyCardDbIds.NOTE;
+    private static final String CARD_ID = DBHelper.LoyaltyCardDbIds.CARD_ID;
+    private static final String BARCODE_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
+    private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;
+    private static final String HEADER_TEXT_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR;
+
+    private Context context;
+    private String host;
+    private String path;
+    private String shareText;
+
+    public ImportURIHelper(Context context) {
+        this.context = context;
+        host = context.getResources().getString(R.string.intent_import_card_from_url_host);
+        path = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix);
+        shareText = context.getResources().getString(R.string.intent_import_card_from_url_share_text);
+    }
+
+    private boolean isImportUri(Uri uri) {
+        return uri.getHost().equals(host) && uri.getPath().equals(path);
+    }
+
+    public LoyaltyCard parse(Uri uri) throws InvalidObjectException, InvalidParameterException {
+        if(!isImportUri(uri)) {
+            throw new InvalidObjectException("Not an import URI");
+        }
+
+        try {
+            String store = uri.getQueryParameter(STORE);
+            String note = uri.getQueryParameter(NOTE);
+            String cardId = uri.getQueryParameter(CARD_ID);
+            String barcodeType = uri.getQueryParameter(BARCODE_TYPE);
+            Integer headerColor = Integer.parseInt(uri.getQueryParameter(HEADER_COLOR));
+            Integer headerTextColor = Integer.parseInt(uri.getQueryParameter(HEADER_TEXT_COLOR));
+            return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor);
+        } catch (NullPointerException | NumberFormatException ex) {
+            ex.printStackTrace();
+            throw new InvalidObjectException("Not a valid import URI");
+        }
+    }
+
+    public Uri toUri(LoyaltyCard loyaltyCard) {
+        Uri.Builder uriBuilder = new Uri.Builder();
+        uriBuilder.scheme("https");
+        uriBuilder.authority(host);
+        uriBuilder.path(path);
+        uriBuilder.appendQueryParameter(STORE, loyaltyCard.store);
+        uriBuilder.appendQueryParameter(NOTE, loyaltyCard.note);
+        uriBuilder.appendQueryParameter(CARD_ID, loyaltyCard.cardId);
+        uriBuilder.appendQueryParameter(BARCODE_TYPE, loyaltyCard.barcodeType);
+        uriBuilder.appendQueryParameter(HEADER_COLOR, loyaltyCard.headerColor.toString());
+        uriBuilder.appendQueryParameter(HEADER_TEXT_COLOR, loyaltyCard.headerTextColor.toString());
+
+        return uriBuilder.build();
+    }
+
+    public void startShareIntent(Uri uri) {
+        Intent sendIntent = new Intent();
+        sendIntent.setAction(Intent.ACTION_SEND);
+        sendIntent.putExtra(Intent.EXTRA_TEXT, shareText + "\n" + uri.toString());
+        sendIntent.setType("text/plain");
+
+        Intent shareIntent = Intent.createChooser(sendIntent, null);
+        context.startActivity(shareIntent);
+    }
+}
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index 802f3cd28..f4b885726 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -5,6 +5,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
@@ -29,6 +30,8 @@ import com.google.zxing.integration.android.IntentResult;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;
 
+import java.io.InvalidObjectException;
+
 public class LoyaltyCardEditActivity extends AppCompatActivity
 {
     private static final String TAG = "CardLocker";
@@ -54,16 +57,19 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
     int loyaltyCardId;
     boolean updateLoyaltyCard;
+    Uri importLoyaltyCardUri = null;
     Integer headingColorValue = null;
     Integer headingStoreTextColorValue = null;
 
     DBHelper db;
+    ImportURIHelper importUriHelper;
 
     private void extractIntentFields(Intent intent)
     {
         final Bundle b = intent.getExtras();
         loyaltyCardId = b != null ? b.getInt("id") : 0;
         updateLoyaltyCard = b != null && b.getBoolean("update", false);
+        importLoyaltyCardUri = intent.getData();
 
         Log.d(TAG, "View activity: id=" + loyaltyCardId
                 + ", updateLoyaltyCard=" + Boolean.toString(updateLoyaltyCard));
@@ -86,6 +92,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         extractIntentFields(getIntent());
 
         db = new DBHelper(this);
+        importUriHelper = new ImportURIHelper(this);
 
         storeFieldEdit = findViewById(R.id.storeNameEdit);
         noteFieldEdit = findViewById(R.id.noteEdit);
@@ -163,7 +170,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 {
                     headingColorValue = LetterBitmap.getDefaultColor(this, loyaltyCard.store);
                 }
-                headingColorSample.setBackgroundColor(headingColorValue);
             }
 
             if(headingStoreTextColorValue == null)
@@ -173,11 +179,29 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 {
                     headingStoreTextColorValue = Color.WHITE;
                 }
-                headingStoreTextColorSample.setBackgroundColor(headingStoreTextColorValue);
             }
 
             setTitle(R.string.editCardTitle);
         }
+        else if(importLoyaltyCardUri != null)
+        {
+            // Try to parse
+            LoyaltyCard importCard;
+            try {
+                importCard = importUriHelper.parse(importLoyaltyCardUri);
+            } catch (InvalidObjectException _) {
+                Toast.makeText(this, R.string.failedParsingImportUriError, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            storeFieldEdit.setText(importCard.store);
+            noteFieldEdit.setText(importCard.note);
+            cardIdFieldView.setText(importCard.cardId);
+            barcodeTypeField.setText(importCard.barcodeType);
+            headingColorValue = importCard.headerColor;
+            headingStoreTextColorValue = importCard.headerTextColor;
+        }
         else
         {
             setTitle(R.string.addCardTitle);
@@ -190,16 +214,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             final int color = (int)(Math.random() * colors.length());
             headingColorValue = colors.getColor(color, Color.BLACK);
             colors.recycle();
-
-            headingColorSample.setBackgroundColor(headingColorValue);
         }
 
-        if(headingStoreTextColorValue == null)
-        {
+        if(headingStoreTextColorValue == null) {
             headingStoreTextColorValue = Color.WHITE;
-            headingStoreTextColorSample.setBackgroundColor(headingStoreTextColorValue);
         }
 
+        headingColorSample.setBackgroundColor(headingColorValue);
+        headingStoreTextColorSample.setBackgroundColor(headingStoreTextColorValue);
         headingColorSelectButton.setOnClickListener(new ColorSelectListener(headingColorValue, true));
         headingStoreTextColorSelectButton.setOnClickListener(new ColorSelectListener(headingStoreTextColorValue, false));
 
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 0da76874d..7616337ab 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -38,8 +38,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     ImageView barcodeImage;
     View collapsingToolbarLayout;
     int loyaltyCardId;
+    LoyaltyCard loyaltyCard;
     boolean rotationEnabled;
     DBHelper db;
+    ImportURIHelper importURIHelper;
     Settings settings;
 
     private void extractIntentFields(Intent intent)
@@ -69,6 +71,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
 
         db = new DBHelper(this);
+        importURIHelper = new ImportURIHelper(this);
 
         cardIdFieldView = findViewById(R.id.cardIdView);
         noteView = findViewById(R.id.noteView);
@@ -105,7 +108,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             window.setAttributes(attributes);
         }
 
-        final LoyaltyCard loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
+        loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
         if(loyaltyCard == null)
         {
             Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
@@ -221,6 +224,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 finish();
                 break;
 
+            case R.id.action_share:
+                importURIHelper.startShareIntent(importURIHelper.toUri(loyaltyCard));
+                return true;
+
             case R.id.action_edit:
                 Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
                 Bundle bundle = new Bundle();
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index 2820fe502..b767ee622 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -10,6 +10,7 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -186,14 +187,23 @@ public class MainActivity extends AppCompatActivity
         Cursor cardCursor = (Cursor)listView.getItemAtPosition(info.position);
         LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
 
-        if(card != null && item.getItemId() == R.id.action_clipboard)
+        if(card != null)
         {
-            ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-            ClipData clip = ClipData.newPlainText(card.store, card.cardId);
-            clipboard.setPrimaryClip(clip);
+            if(item.getItemId() == R.id.action_clipboard)
+            {
+                ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+                ClipData clip = ClipData.newPlainText(card.store, card.cardId);
+                clipboard.setPrimaryClip(clip);
 
-            Toast.makeText(this, R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
-            return true;
+                Toast.makeText(this, R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
+                return true;
+            }
+            else if(item.getItemId() == R.id.action_share)
+            {
+                final ImportURIHelper importURIHelper = new ImportURIHelper(this);
+                importURIHelper.startShareIntent(importURIHelper.toUri(card));
+                return true;
+            }
         }
 
         return super.onContextItemSelected(item);
diff --git a/app/src/main/res/drawable-hdpi/ic_share_white.png b/app/src/main/res/drawable-hdpi/ic_share_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..629f50dcd7b486da273be738d90964ac75b79b86
GIT binary patch
literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0005;Nkl<Zc-rll
z%}&BV6om`MvVoO9xbkPM5+m$1K7qQFE;PP@@dbpy3ut@+r~x<XQgma8Bw$3}3C|?A
zNf({gLF3$OI?1=8C7d%e_snG+CmredKVveP%qpab&H)d!zzfl$&vM+w7eNPnYEaLL
zoM*lpBR-(ZawQ<D`VH{`RgMPQ1_s(34Gatn3^*DXiZuX1>!2@g3qi;NsDZJ8c>6^R
z0WLT;ob~Wokh3X%2i!#nQ>)MfH!<RGtsP|e;Z<;{5vE#&jZpt{M4$DEHnkG24dHok
zrb(F|*aun7ceA=@e<3_e;(8InM`S8*s{lP()&bF?Wq0YFP0h*rLEC8A)~qfibc?D0
z8=6>Dg}VzfHlwdIMeMy&WV*Jq+cOmYPKVT-#BQ-4#G=%0aVWjrWobbC7MiAr>tLRX
zfuF?aiS-!$g@f!K>{&a=rf4O6O)GH)RwUf8sb=l~JVh9J1LvS1!AOC`jv|aagF`SQ
z!N?l8*3^#LZl%z>Ti}9f%BPlOn~M=u$PY1pDeEyI(O_|{NcW(p6tSkU+_0WxAtQ@4
z>n7JKD#^;+>Z1f64NTNH7P-kO?{hTZOE*xHzJ<zEpz?~C3}h&gk_<H2#HglG)OE9C
sdgeOZ2Siq=Cj3w<QE}3dj&vlBFC$5)qe&ayJ^%m!07*qoM6N<$f{p(7E&u=k

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_share_white.png b/app/src/main/res/drawable-mdpi/ic_share_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2e4b472b353a55ea6b12add79341605a32036ec
GIT binary patch
literal 397
zcmV;80doF{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800040Nkl<Zc-rlj
zze_?<6vtl=N>I0I)xj~VIjT)`(MfQN#+J~3porE)h?cfUaSjwjog#${>wkKE51im~
zd0iFmIW8Xfz~#Q-`@Q%4csB?(Arw&*rNIf4))udUDfnS%UDFaT7{WFM4Fg?=fv$#u
znZv-RwD_)-dz*oj@HV&r9}aQiT0;C3ycr^7q7x(j3=%$tGvLt>n1ee`LkNoCmMPJm
zFX0rZTgCPY4t$<23z~eL!~>tW0>*~$2$aE=Z}In-9L|mPjBg<+QB=(Zl}vfhNcOU;
zm8Ke#Z0!cto`O}1FePbXnKm5rUKnTv52A)Oh}z&#`_)6Y^kkU$2KQi(zaN1s=2+6m
zx%D%eSjPUi@j5Xr6FcCN#a$g#l}^h(7&;8RXw*jEVW6jBpye>o(lC$*Uoqmem)C01
rGkSoUk5Sswo)h#e%Q0cFiGSi3TV0vi=<vSW00000NkvXXu0mjfyKu9U

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_share_white.png b/app/src/main/res/drawable-xhdpi/ic_share_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..56443526ed38a29f368ec2b563ac0c362f4a8060
GIT binary patch
literal 758
zcmV<S0tx+zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008LNkl<Zc-rln
z&r2Io5XTciX`}QItrx|X>dCbBQ0gI~2M=CaZRt_4hzF0M)q}UTlpd5G6b~W_{=A5g
z3L@6l7HX*4M*pYy9he1K%)Z^c2$|V8@F7d~<?#LH?VC5VFOhKJ!i5VLa-vi!)q$sA
z5`17L`MWyp;(NgkxGV$R>(wfL6chu*d(fCsZQ_T(MF{a8G<Haf_$Kf>f_M-5O_K%#
z#wrl+F{Z(QRSN@FH5hPgVZgBl1O8hWaHhe4Lkj~ABnwZ17vPVD0kcxYXTZ9JaF0Q0
z!qdFBFIGYP7R@3l!s|KTpHxA(w+U*OB0dZ920<IV9nOakzYn@32=4$31~EUtuvg~d
z^DdYulNk=VEKb$B@D#{_^8n%JJf<-qLp<WyljZAVtqZ3{#!GNy_}6JxbZ9GQGyEI}
z3I7KAB#7w*(_j}A7`mPU4}D{s!AC<af5I7{UP7vxG34kX8$pZJTSHnaa?Wp-lBbs=
z<l(=D`?Sl;NP326s<c5l;{AP6lK9RlY)!qimXf%FPg{zg7oFC4g|Ae6UPBHq#JwXE
zdjn$s2*iF7jCUHmg^kd#xYyXXuob4t@UcV_q8391!yDXBphe=E5Vjm{VUa=QaDmNg
zNN5d+djd8?G(`F}n?NnG5%AMs#G-#DX)~e`yaWFNOrU%3gAO=wWAq*&)rbfDZwJi=
znk}!cr%gT$HtXv)(K<2*o=G%f0PGoz*apwJg=R{@U%(w{CNzL?%fjnAD>dI_En~!e
z@Hyg%uyW)iFO)qz?QIM=1Fh22=4;C{Lh=txLd4hDoe=REux7IuYA|5lrWvEbfLtsy
zfiELeYCw;c`eCU8@k^Qts5bB`f_NI+rmc$X2H!)7r!n1HOX)PX<xX!9e#-aK3GG4E
o9v_Z+!(_!(fG%9Pa8V0!1!HFz+S7f8)&Kwi07*qoM6N<$f_%SM?*IS*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_white.png b/app/src/main/res/drawable-xxhdpi/ic_share_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..7904aedee8360f3ebbda425e9618710499965bc6
GIT binary patch
literal 1248
zcmV<61Rwi}P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000E1Nkl<Zc-rlp
z+e=hY6vlNd4NEhjGVc#s&_hu|zC@RSddZ9;CXkBW8@dQWVR^wY=wd2CS%Kn%VW^ad
zl}0sF=IHo8*;=>;M{V4*_c?n`aJ~f}cspm9-{-8o&RYANtSkfqfj}S-2m}K0Kg9C#
zayBWKR4C%Fvq8o__!3fx)JGa2O^HV2XZ*Voka8b<IjM~lBP}TulfNwoIp^R5q%)+M
zG{CRdj2s&PNpl05NPi6AC&b4#futGyAZgJ7{Dk-%K@io0UtySbHcLkpAe+7ctuDe(
zs1;<>gI`UGS}=gmSq;K!140(yClmr<wE?{r4d?}7wE+_r4VVC7wE<C!21G$vZ9ohL
zcx%8UQjmA>b4YJ28qf#Iso__Vp19P0NTn+vy%Bs7=@x0uB6wDWR0-m%;PXfgq>q-t
zC-eYQvsL&9NpCHun`C`QGj0WZsZ6UDG6a4}UhAaa!S9ga%B&{5uMXD+KK7cgQxCoQ
z<1#eY1$T$Ei*&+pHt>UV*0=EKjn|TT45n94*SC%7``x5_Qpu>!@k`R&9zU0rw@E)W
zz{g4NIal+=Sc>!VfWC}$S+<~X)9$lqoYXI^><V8F;sp?wm7fgi^Q)xony<&3v+_m0
z&hZTXFloqO$HGHSFDT5Nmz8sxdHx;g5ccetgU>ZAE2l|~e7ql_WlO^=Bn#HK3_qf>
zp!LcESE)!hr%7W5d7k?{`F;hTNEMMZ>*xE)n_T4_Tvk5Uyo%-F$}>`ppX>3U;f2h!
zTtwwdSsBqh{sZZhuk$>;`Rfixd@*Tc=^QgF>qD-e!Dq{Vek_AcuisKumZC~o$@w!G
zgg=O~a_xVATZX{%Rqr`~Uu!^>!GdYhY2>nUCx~w}AY>Unm!h>Go!WqYi|}88u-bre
ziv~=Bu-X8ddn;og3<HpY5Lkp!hJy6}aUoU&;@-C+8qkXHz8N<pgLxQ{^eM=6J9<t&
zd1yx`8R6AHhWBIU!GSDKN0MXm+5w~^_lEL4nnU>oIcC4_Z;o(rTT0MiTMEC%UEZdS
zoaBy~d6MV9X&Ui`bkWxXdzX#iXSuZ-Y)#}D@)4A+?wAk|n8OB}b2~_TLD3x}_$KQM
z26wvi`f!6(0E+GyQA}#qEL-EUla3eoEeezQ*`eo2VN$1jif+oL-+h}M?>8e37_`RY
zQnuFo<9xjD=!Ih7#J4BCBprnVtKfJy^{B!6&?29vLV1Q<T=N{=e3Ks>STUhM+9JAb
zjVS~3k~NIS6Rb6YZ=mbS;2rWya*J#}=x@yDg9d5ERNblWzVx#R+enur&Db`8ySm3f
zJ$2dI;_w;KX>BOL(^57!qDIP0TWKkRC#I-P*ebIJTc3hPP*$7JY|(%)2&)ZvY|(%Y
z5LO$|Y0-dA5LO!yMhf!QfJQ9B-nT0vC_}w7fG2DN77Q4`2sC{Y>RjH{$LFd8+4K#_
zk*=v*26Ukrr*A@m!&yK=qnJ0Fn^0!3+hYAdrVJ#VnZVBueMFkq06#CsU?k~cWmHdk
zt(c}Q%HPzZ;<0B&v0SW$WmjIie9b>A1|b9jfj}S-2m}J*H2wlfCD~q66H1u?0000<
KMNUMnLSTX%F->m(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/menu/card_longclick_menu.xml b/app/src/main/res/menu/card_longclick_menu.xml
index 67ac03c88..5ff953855 100644
--- a/app/src/main/res/menu/card_longclick_menu.xml
+++ b/app/src/main/res/menu/card_longclick_menu.xml
@@ -6,4 +6,8 @@
         android:id="@+id/action_clipboard"
         android:title="@string/copy_to_clipboard"
         app:showAsAction="always"/>
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/share"
+        app:showAsAction="always"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/card_view_menu.xml b/app/src/main/res/menu/card_view_menu.xml
index df5498c9e..61c580f8a 100644
--- a/app/src/main/res/menu/card_view_menu.xml
+++ b/app/src/main/res/menu/card_view_menu.xml
@@ -7,6 +7,11 @@
         android:icon="@drawable/ic_lock_open_white_24dp"
         android:title="@string/lockScreen"
         app:showAsAction="always"/>
+    <item
+        android:id="@+id/action_share"
+        android:icon="@drawable/ic_share_white"
+        android:title="@string/share"
+        app.showAsAction="always"/>
     <item
         android:id="@+id/action_edit"
         android:icon="@drawable/ic_mode_edit_white_24dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 260c5dd31..740c814ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,6 +27,7 @@
     <string name="deleteConfirmation">Please confirm that you want to delete this card.</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copy ID to clipboard</string>
+    <string name="share">Share</string>
     <string name="sendLabel">Send&#8230;</string>
     <string name="addedShortcut">Added to Home Screen</string>
 
@@ -42,6 +43,7 @@
     <string name="noStoreError">No Store entered</string>
     <string name="noCardIdError">No Card ID entered</string>
     <string name="noCardExistsError">Could not lookup loyalty card</string>
+    <string name="failedParsingImportUriError">Could not parse the import Uri</string>
 
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="storeNameAndNoteFormat" translatable="false">%1$s - %2$s</string>
@@ -125,4 +127,9 @@
     <string name="settings_key_display_barcode_max_brightness" translatable="false">pref_display_card_max_brightness</string>
     <string name="settings_lock_barcode_orientation">Lock barcode orientation</string>
     <string name="settings_key_lock_barcode_orientation" translatable="false">pref_lock_barcode_orientation</string>
+
+    <string name="intent_import_card_from_url">Import loyalty card</string>
+    <string name="intent_import_card_from_url_share_text">I want to share a loyalty card with you</string>
+    <string name="intent_import_card_from_url_host" translatable="false">github.com</string>
+    <string name="intent_import_card_from_url_path_prefix" translatable="false">/brarcher/loyalty-card-locker</string>
 </resources>

From 3d2ad1693ac6b16f64251abd2f549ef2e32707c4 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 1 Dec 2019 20:42:37 +0100
Subject: [PATCH 03/10] Tests

---
 .../protect/card_locker/ImportURITest.java    | 73 +++++++++++++++++++
 .../LoyaltyCardViewActivityTest.java          |  5 +-
 2 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 app/src/test/java/protect/card_locker/ImportURITest.java

diff --git a/app/src/test/java/protect/card_locker/ImportURITest.java b/app/src/test/java/protect/card_locker/ImportURITest.java
new file mode 100644
index 000000000..e06a8ea68
--- /dev/null
+++ b/app/src/test/java/protect/card_locker/ImportURITest.java
@@ -0,0 +1,73 @@
+package protect.card_locker;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.net.Uri;
+
+import com.google.zxing.BarcodeFormat;
+
+import org.bouncycastle.util.test.TestFailedException;
+import org.bouncycastle.util.test.TestResult;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.io.InvalidObjectException;
+
+import static org.junit.Assert.assertEquals;
+
+import static org.junit.Assert.assertTrue;
+import static protect.card_locker.DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(constants = BuildConfig.class, sdk = 23)
+public class ImportURITest {
+    private ImportURIHelper importURIHelper;
+    private DBHelper db;
+
+    @Before
+    public void setUp()
+    {
+        Activity activity = Robolectric.setupActivity(MainActivity.class);
+        importURIHelper = new ImportURIHelper(activity);
+        db = new DBHelper(activity);
+    }
+
+    @Test
+    public void ensureNoDataLoss() throws InvalidObjectException
+    {
+        // Generate card
+        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), BARCODE_TYPE, Color.BLACK, Color.WHITE);
+
+        // Get card
+        LoyaltyCard card = db.getLoyaltyCard(1);
+
+        // Card to URI
+        Uri cardUri = importURIHelper.toUri(card);
+
+        // Parse URI
+        LoyaltyCard parsedCard = importURIHelper.parse(cardUri);
+
+        // Compare everything
+        assertEquals(card.barcodeType, parsedCard.barcodeType);
+        assertEquals(card.cardId, parsedCard.cardId);
+        assertEquals(card.headerColor, parsedCard.headerColor);
+        assertEquals(card.headerTextColor, parsedCard.headerTextColor);
+        assertEquals(card.note, parsedCard.note);
+        assertEquals(card.store, parsedCard.store);
+    }
+
+    @Test
+    public void failToParseInvalidUri()
+    {
+        try {
+            importURIHelper.parse(Uri.parse("https://example.com/test"));
+            assertTrue(false); // Shouldn't get here
+        } catch(InvalidObjectException _) {
+            // Desired behaviour
+        }
+    }
+}
diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
index 6f9218146..1dd5f0bd9 100644
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -448,10 +448,11 @@ public class LoyaltyCardViewActivityTest
         final Menu menu = shadowOf(activity).getOptionsMenu();
         assertTrue(menu != null);
 
-        // The settings and add button should be present
-        assertEquals(menu.size(), 2);
+        // The share, settings and add button should be present
+        assertEquals(menu.size(), 3);
 
         assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
+        assertEquals("Share", menu.findItem(R.id.action_share).getTitle().toString());
         assertEquals("Edit", menu.findItem(R.id.action_edit).getTitle().toString());
     }
 

From 48a1084c404127aa8f11bebe09daa0d0bec3bc0a Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 1 Dec 2019 20:46:13 +0100
Subject: [PATCH 04/10] Fix typo

---
 app/src/main/res/menu/card_view_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/menu/card_view_menu.xml b/app/src/main/res/menu/card_view_menu.xml
index 61c580f8a..3910d3faa 100644
--- a/app/src/main/res/menu/card_view_menu.xml
+++ b/app/src/main/res/menu/card_view_menu.xml
@@ -11,7 +11,7 @@
         android:id="@+id/action_share"
         android:icon="@drawable/ic_share_white"
         android:title="@string/share"
-        app.showAsAction="always"/>
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_edit"
         android:icon="@drawable/ic_mode_edit_white_24dp"

From 22e8d7f6994fe731b5a06a977fd5406ff16d944c Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 1 Dec 2019 20:53:37 +0100
Subject: [PATCH 05/10] Fix linter warning

---
 .../main/java/protect/card_locker/LoyaltyCardEditActivity.java  | 2 +-
 app/src/test/java/protect/card_locker/ImportURITest.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index f4b885726..0d115c4a8 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -189,7 +189,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             LoyaltyCard importCard;
             try {
                 importCard = importUriHelper.parse(importLoyaltyCardUri);
-            } catch (InvalidObjectException _) {
+            } catch (InvalidObjectException ex) {
                 Toast.makeText(this, R.string.failedParsingImportUriError, Toast.LENGTH_LONG).show();
                 finish();
                 return;
diff --git a/app/src/test/java/protect/card_locker/ImportURITest.java b/app/src/test/java/protect/card_locker/ImportURITest.java
index e06a8ea68..42f28ebe1 100644
--- a/app/src/test/java/protect/card_locker/ImportURITest.java
+++ b/app/src/test/java/protect/card_locker/ImportURITest.java
@@ -66,7 +66,7 @@ public class ImportURITest {
         try {
             importURIHelper.parse(Uri.parse("https://example.com/test"));
             assertTrue(false); // Shouldn't get here
-        } catch(InvalidObjectException _) {
+        } catch(InvalidObjectException ex) {
             // Desired behaviour
         }
     }

From bae6f746a1cfc67a94226336ccf98fd72cc8448e Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 1 Dec 2019 22:38:31 +0100
Subject: [PATCH 06/10] Another import test

---
 .../LoyaltyCardViewActivityTest.java          | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
index 1dd5f0bd9..bfc5c2223 100644
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -7,6 +7,8 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ResolveInfo;
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.widget.TextViewCompat;
@@ -605,4 +607,25 @@ public class LoyaltyCardViewActivityTest
             }
         }
     }
+
+    @Test
+    public void importCard()
+    {
+        Uri importUri = Uri.parse("https://github.com/brarcher/loyalty-card-locker?store=Example%20Storenote=&cardid=123456&barcodetype=AZTEC&headercolor=-416706&headertextcolor=-1");
+
+        Intent intent = new Intent();
+        intent.setData(importUri);
+
+        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).withIntent(intent).create();
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        Activity activity = (Activity)activityController.get();
+
+        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", "123456", "AZTEC");
+        assertEquals(activity.findViewById(R.id.headingColorSample).getBackground(), new ColorDrawable(-416706));
+        assertEquals(activity.findViewById(R.id.headingStoreTextColorSample).getBackground(), new ColorDrawable(-1));
+    }
 }

From 2ef739fb4f9005c9200fea6aad134ff8b2634f7e Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 1 Dec 2019 22:55:17 +0100
Subject: [PATCH 07/10] Fix typo

---
 .../java/protect/card_locker/LoyaltyCardViewActivityTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
index bfc5c2223..81132e29f 100644
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -611,7 +611,7 @@ public class LoyaltyCardViewActivityTest
     @Test
     public void importCard()
     {
-        Uri importUri = Uri.parse("https://github.com/brarcher/loyalty-card-locker?store=Example%20Storenote=&cardid=123456&barcodetype=AZTEC&headercolor=-416706&headertextcolor=-1");
+        Uri importUri = Uri.parse("https://github.com/brarcher/loyalty-card-locker?store=Example%20Store&note=&cardid=123456&barcodetype=AZTEC&headercolor=-416706&headertextcolor=-1");
 
         Intent intent = new Intent();
         intent.setData(importUri);

From e314580ac346e3573b4f0cec85178e5de58af33d Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Mon, 2 Dec 2019 12:56:42 +0100
Subject: [PATCH 08/10] Cleanup

---
 .../protect/card_locker/ImportURIHelper.java  | 22 ++++++++++---------
 .../protect/card_locker/ImportURITest.java    | 11 ++--------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/ImportURIHelper.java b/app/src/main/java/protect/card_locker/ImportURIHelper.java
index 18d76903f..d3133bcb3 100644
--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -3,9 +3,7 @@ package protect.card_locker;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-
 import java.io.InvalidObjectException;
-import java.security.InvalidParameterException;
 
 public class ImportURIHelper {
     private static final String STORE = DBHelper.LoyaltyCardDbIds.STORE;
@@ -15,10 +13,10 @@ public class ImportURIHelper {
     private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;
     private static final String HEADER_TEXT_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR;
 
-    private Context context;
-    private String host;
-    private String path;
-    private String shareText;
+    private final Context context;
+    private final String host;
+    private final String path;
+    private final String shareText;
 
     public ImportURIHelper(Context context) {
         this.context = context;
@@ -31,7 +29,7 @@ public class ImportURIHelper {
         return uri.getHost().equals(host) && uri.getPath().equals(path);
     }
 
-    public LoyaltyCard parse(Uri uri) throws InvalidObjectException, InvalidParameterException {
+    public LoyaltyCard parse(Uri uri) throws InvalidObjectException {
         if(!isImportUri(uri)) {
             throw new InvalidObjectException("Not an import URI");
         }
@@ -45,12 +43,12 @@ public class ImportURIHelper {
             Integer headerTextColor = Integer.parseInt(uri.getQueryParameter(HEADER_TEXT_COLOR));
             return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor);
         } catch (NullPointerException | NumberFormatException ex) {
-            ex.printStackTrace();
             throw new InvalidObjectException("Not a valid import URI");
         }
     }
 
-    public Uri toUri(LoyaltyCard loyaltyCard) {
+    // Protected for usage in tests
+    protected Uri toUri(LoyaltyCard loyaltyCard) {
         Uri.Builder uriBuilder = new Uri.Builder();
         uriBuilder.scheme("https");
         uriBuilder.authority(host);
@@ -65,7 +63,7 @@ public class ImportURIHelper {
         return uriBuilder.build();
     }
 
-    public void startShareIntent(Uri uri) {
+    private void startShareIntent(Uri uri) {
         Intent sendIntent = new Intent();
         sendIntent.setAction(Intent.ACTION_SEND);
         sendIntent.putExtra(Intent.EXTRA_TEXT, shareText + "\n" + uri.toString());
@@ -74,4 +72,8 @@ public class ImportURIHelper {
         Intent shareIntent = Intent.createChooser(sendIntent, null);
         context.startActivity(shareIntent);
     }
+
+    public void startShareIntent(LoyaltyCard loyaltyCard) {
+        startShareIntent(toUri(loyaltyCard));
+    }
 }
diff --git a/app/src/test/java/protect/card_locker/ImportURITest.java b/app/src/test/java/protect/card_locker/ImportURITest.java
index 42f28ebe1..c78f95605 100644
--- a/app/src/test/java/protect/card_locker/ImportURITest.java
+++ b/app/src/test/java/protect/card_locker/ImportURITest.java
@@ -3,24 +3,17 @@ package protect.card_locker;
 import android.app.Activity;
 import android.graphics.Color;
 import android.net.Uri;
-
 import com.google.zxing.BarcodeFormat;
-
-import org.bouncycastle.util.test.TestFailedException;
-import org.bouncycastle.util.test.TestResult;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
-
 import java.io.InvalidObjectException;
-
 import static org.junit.Assert.assertEquals;
-
 import static org.junit.Assert.assertTrue;
-import static protect.card_locker.DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
+import static protect.card_locker.DBHelper.LoyaltyCardDbIds;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 23)
@@ -40,7 +33,7 @@ public class ImportURITest {
     public void ensureNoDataLoss() throws InvalidObjectException
     {
         // Generate card
-        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), BARCODE_TYPE, Color.BLACK, Color.WHITE);
+        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         // Get card
         LoyaltyCard card = db.getLoyaltyCard(1);

From 5e836758e51522beb277835191e249299cec085f Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Mon, 2 Dec 2019 12:57:44 +0100
Subject: [PATCH 09/10] Fix function calls

---
 .../main/java/protect/card_locker/LoyaltyCardViewActivity.java  | 2 +-
 app/src/main/java/protect/card_locker/MainActivity.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 7616337ab..d3db308e3 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -225,7 +225,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 break;
 
             case R.id.action_share:
-                importURIHelper.startShareIntent(importURIHelper.toUri(loyaltyCard));
+                importURIHelper.startShareIntent(loyaltyCard);
                 return true;
 
             case R.id.action_edit:
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index b767ee622..b1a0a7e0f 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -201,7 +201,7 @@ public class MainActivity extends AppCompatActivity
             else if(item.getItemId() == R.id.action_share)
             {
                 final ImportURIHelper importURIHelper = new ImportURIHelper(this);
-                importURIHelper.startShareIntent(importURIHelper.toUri(card));
+                importURIHelper.startShareIntent(card);
                 return true;
             }
         }

From 07c74b79f3b07b61ff4a444d94f50d93c9fe1903 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Mon, 2 Dec 2019 13:14:15 +0100
Subject: [PATCH 10/10] Use README as index page, add share page with
 explanation

---
 app/src/main/res/values/strings.xml                    |  4 ++--
 .../card_locker/LoyaltyCardViewActivityTest.java       |  2 +-
 docs/index.md                                          |  1 +
 docs/share.md                                          | 10 ++++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 120000 docs/index.md
 create mode 100644 docs/share.md

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 740c814ba..dd540c0b7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -130,6 +130,6 @@
 
     <string name="intent_import_card_from_url">Import loyalty card</string>
     <string name="intent_import_card_from_url_share_text">I want to share a loyalty card with you</string>
-    <string name="intent_import_card_from_url_host" translatable="false">github.com</string>
-    <string name="intent_import_card_from_url_path_prefix" translatable="false">/brarcher/loyalty-card-locker</string>
+    <string name="intent_import_card_from_url_host" translatable="false">brarcher.github.io</string>
+    <string name="intent_import_card_from_url_path_prefix" translatable="false">/loyalty-card-locker/share</string>
 </resources>
diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
index 81132e29f..2d543527f 100644
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -611,7 +611,7 @@ public class LoyaltyCardViewActivityTest
     @Test
     public void importCard()
     {
-        Uri importUri = Uri.parse("https://github.com/brarcher/loyalty-card-locker?store=Example%20Store&note=&cardid=123456&barcodetype=AZTEC&headercolor=-416706&headertextcolor=-1");
+        Uri importUri = Uri.parse("https://brarcher.github.io/loyalty-card-locker/share?store=Example%20Store&note=&cardid=123456&barcodetype=AZTEC&headercolor=-416706&headertextcolor=-1");
 
         Intent intent = new Intent();
         intent.setData(importUri);
diff --git a/docs/index.md b/docs/index.md
new file mode 120000
index 000000000..32d46ee88
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file
diff --git a/docs/share.md b/docs/share.md
new file mode 100644
index 000000000..c4d1ed8c6
--- /dev/null
+++ b/docs/share.md
@@ -0,0 +1,10 @@
+# Shared Loyalty Card
+
+Someone wants to share a loyalty card with you. To import this loyalty card, you will first need to install the Loyalty Card Locker app. It is free, Open Source and contains no ads.
+
+<a href="https://f-droid.org/repository/browse/?fdid=protect.card_locker" target="_blank">
+<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
+<a href="https://play.google.com/store/apps/details?id=protect.card_locker" target="_blank">
+<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90"/></a>
+
+After installing the app, just click the link you were given again and choose "Import loyalty card".