Changeset 30822 in osm for applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java

Timestamp:

2014-11-29T16:30:52+01:00 (10 years ago)

Author:

donvip

Message:

[josm_native-password-manager] update Netbeans Keyring code + make plugin rely on JNA plugin

File:

• applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java (modified) (3 diffs)

applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java

@@ -43 +43 @@
 package org.netbeans.modules.keyring.gnome;
 
+import com.sun.jna.DefaultTypeMapper;
+import com.sun.jna.FromNativeContext;
 import com.sun.jna.Library;
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
+import com.sun.jna.ToNativeContext;
+import com.sun.jna.TypeConverter;
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 /**
@@ -55 +64 @@
 public interface GnomeKeyringLibrary extends Library {
 
-    GnomeKeyringLibrary LIBRARY = (GnomeKeyringLibrary) Native.loadLibrary("gnome-keyring", GnomeKeyringLibrary.class);
+    class LibFinder {
+        private static final String GENERIC = "gnome-keyring";
+        // http://packages.ubuntu.com/search?suite=precise&arch=any&mode=exactfilename&searchon=contents&keywords=libgnome-keyring.so.0
+        private static final String EXPLICIT_ONEIRIC = "/usr/lib/libgnome-keyring.so.0";
+        private static Object load(Map<?,?> options) {
+            try {
+                return Native.loadLibrary(GENERIC, GnomeKeyringLibrary.class, options);
+            } catch (UnsatisfiedLinkError x) {
+                // #203735: on Oneiric, may have trouble finding right lib.
+                // Precise is using multiarch (#211401) which should work automatically using JNA 3.4+ (#211403).
+                // Unclear if this workaround is still needed for Oneiric with 3.4, but seems harmless to leave it in for now.
+                if (new File(EXPLICIT_ONEIRIC).isFile()) {
+                    return Native.loadLibrary(EXPLICIT_ONEIRIC, GnomeKeyringLibrary.class, options);
+                } else {
+                    throw x;
+                }
+            }
+        }
+        private LibFinder() {}
+    }
+
+    GnomeKeyringLibrary LIBRARY = (GnomeKeyringLibrary) LibFinder.load(Collections.singletonMap(OPTION_TYPE_MAPPER, new DefaultTypeMapper() {
+        {
+            addTypeConverter(Boolean.TYPE, new TypeConverter() { // #198921
+                @Override public Object toNative(Object value, ToNativeContext context) {
+                    return Boolean.TRUE.equals(value) ? 1 : 0;
+                }
+                @Override public Object fromNative(Object value, FromNativeContext context) {
+                    return ((Integer) value).intValue() != 0;
+                }
+                @Override public Class<?> nativeType() {
+                    // gint is 32-bit int
+                    return Integer.class;
+                }
+            });
+        }
+    }));
 
     boolean gnome_keyring_is_available();
@@ -98 +143 @@
         public /*GnomeKeyringAttributeList*/Pointer attributes;
         public String secret;
+
+        @Override
+        protected List<String> getFieldOrder() {
+            return Arrays.asList( new String[] {
+                "keyring",
+                "item_id",
+                "attributes",
+                "secret",
+            } );
+        }
     }