calabash-android 0.4.0.pre8 → 0.4.0.pre9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -89,7 +89,9 @@ end
|
|
|
89
89
|
|
|
90
90
|
def fingerprint_from_keystore
|
|
91
91
|
keystore_info = read_keystore_info
|
|
92
|
-
|
|
92
|
+
cmd = "#{keytool_path} -v -list -alias #{keystore_info["keystore_alias"]} -keystore #{keystore_info["keystore_location"]} -storepass #{keystore_info["keystore_password"]}"
|
|
93
|
+
log cmd
|
|
94
|
+
fingerprints = `#{cmd}`
|
|
93
95
|
md5_fingerprint = extract_md5_fingerprint(fingerprints)
|
|
94
96
|
log "MD5 fingerprint for keystore (#{keystore_info["keystore_location"]}): #{md5_fingerprint}"
|
|
95
97
|
md5_fingerprint
|
|
@@ -107,7 +109,9 @@ def fingerprint_from_apk(app_path)
|
|
|
107
109
|
raise "No RSA file found in META-INF. Cannot proceed." if rsa_files.empty?
|
|
108
110
|
raise "More than one RSA file found in META-INF. Cannot proceed." if rsa_files.length > 1
|
|
109
111
|
|
|
110
|
-
|
|
112
|
+
cmd = "#{keytool_path} -v -printcert -file #{rsa_files.first}"
|
|
113
|
+
log cmd
|
|
114
|
+
fingerprints = `#{cmd}`
|
|
111
115
|
md5_fingerprint = extract_md5_fingerprint(fingerprints)
|
|
112
116
|
log "MD5 fingerprint for signing cert (#{app_path}): #{md5_fingerprint}"
|
|
113
117
|
md5_fingerprint
|
|
@@ -116,6 +120,8 @@ def fingerprint_from_apk(app_path)
|
|
|
116
120
|
end
|
|
117
121
|
|
|
118
122
|
def extract_md5_fingerprint(fingerprints)
|
|
123
|
+
log fingerprints
|
|
124
|
+
|
|
119
125
|
if is_windows?
|
|
120
126
|
if fingerprints.encoding.name == "CP850"
|
|
121
127
|
fingerprints = fingerprints.gsub("\xA0".force_encoding("CP850"),"")
|
|
Binary file
|
data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ViewMapper.java
CHANGED
|
@@ -76,13 +76,16 @@ public class ViewMapper {
|
|
|
76
76
|
Object value = entry.getValue();
|
|
77
77
|
if (value instanceof View) {
|
|
78
78
|
copy.put(entry.getKey(), UIQueryUtils.getId((View) value));
|
|
79
|
-
}
|
|
79
|
+
}
|
|
80
80
|
else {
|
|
81
81
|
copy.put(entry.getKey(),entry.getValue());
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
|
|
85
85
|
return copy;
|
|
86
|
+
}
|
|
87
|
+
else if (o instanceof CharSequence) {
|
|
88
|
+
return o.toString();
|
|
86
89
|
}
|
|
87
90
|
return o;
|
|
88
91
|
}
|