Browse Source

Fix #7
Fix #10
Bugfixes on copy to clipboard

isundil 7 years ago
parent
commit
c6c76e4d09

+ 1 - 0
app/src/main/java/info/knacki/pass/ui/MainActivity.java

@@ -236,6 +236,7 @@ public class MainActivity extends AppCompatActivity implements PasswordEditListe
                 ClipboardManager clip = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
                 if (clip != null) {
                     clip.setPrimaryClip(ClipData.newPlainText("password", result));
+                    Toast.makeText(MainActivity.this, getString(R.string.copied_clipboard), Toast.LENGTH_LONG).show();
                 }
             }
 

+ 2 - 2
app/src/main/java/info/knacki/pass/ui/passwordList/EditablePasswordListView.java

@@ -39,12 +39,12 @@ public class EditablePasswordListView<T extends Activity & PasswordEditListener>
 
         switch (item.getItemId()) {
             case R.id.remove:
-                fClickListener.OnRemovePassword(new File(fCurrentDir +"/" +fSelectedPassword.vName.getText()));
+                fClickListener.OnRemovePassword(new File(fCurrentDir +"/" +fSelectedPassword.fFullname));
                 found = true;
                 break;
 
             case R.id.clipboard:
-                fClickListener.OnCopyToClipboard(new File(fCurrentDir +"/" +fSelectedPassword.vName.getText()));
+                fClickListener.OnCopyToClipboard(new File(fCurrentDir +"/" +fSelectedPassword.fFullname));
                 found = true;
                 break;
         }

+ 2 - 0
app/src/main/java/info/knacki/pass/ui/passwordList/PasswordView.java

@@ -12,6 +12,7 @@ public class PasswordView extends LinearLayout {
     public final static int ICON_SIZE = 128;
     protected final ImageView vIcon;
     protected final TextView vName;
+    protected final String fFullname;
 
     public static final int TYPE_DIR = 1;
     public static final int TYPE_PARENT = 2;
@@ -26,6 +27,7 @@ public class PasswordView extends LinearLayout {
 
     public PasswordView(Context ctx, int type, String name) {
         super(ctx);
+        fFullname = name;
         vIcon = new ImageView(ctx);
         if ((type & TYPE_PARENT) != 0)
             vIcon.setImageResource(android.R.drawable.ic_media_previous);

+ 1 - 0
app/src/main/res/values-fr/lang.xml

@@ -65,4 +65,5 @@
     <string name="useTheir">Utiliser leur version</string>
     <string name="remove">Supprimer</string>
     <string name="copy_clipboard">Copier dans le presse-papier</string>
+    <string name="copied_clipboard">Mot de passe dans le presse-papier</string>
 </resources>

+ 1 - 0
app/src/main/res/values/lang.xml

@@ -65,4 +65,5 @@
     <string name="useTheir">Use their</string>
     <string name="remove">Remove</string>
     <string name="copy_clipboard">Copy to clipboard</string>
+    <string name="copied_clipboard">Password copied to Clipboard</string>
 </resources>