2222import android .annotation .SuppressLint ;
2323import android .app .AlertDialog ;
2424import android .content .ActivityNotFoundException ;
25+ import android .content .ClipData ;
2526import android .content .Intent ;
2627import android .net .Uri ;
2728import android .os .AsyncTask ;
@@ -89,10 +90,10 @@ private Gui() {
8990 editService );
9091
9192 Button cmdView = findViewById (R .id .cmd_view );
92- cmdView .setOnClickListener (v -> onStartQuery ());
93+ cmdView .setOnClickListener (v -> onStartQuery (false ));
9394 /*
9495 Button cmdShare = findViewById(R.id.cmd_share);
95- cmdShare.setOnClickListener(v -> onStartQuery());
96+ cmdShare.setOnClickListener(v -> onStartQuery(true ));
9697 */
9798 Button cmdCancel = findViewById (R .id .cmd_cancel );
9899 cmdCancel .setOnClickListener (v -> cancel ());
@@ -131,6 +132,8 @@ private void initServiceHistory() {
131132 includeService (
132133 languages .get ("simple_v" ), // last in list
133134 languages .get ("simple_p" ),
135+ languages .get ("en_m" ),
136+ languages .get ("en_d" ),
134137 languages .get ("en_v" ),
135138 languages .get ("en_p" ),
136139 languages .get (language + "_v" ),
@@ -196,6 +199,10 @@ public void setGuiMessage(int stringId, Object... parameters) {
196199 }
197200
198201 class GeoLoadTask extends AsyncTask <GeoPointDto , Void , ArticlesDownloadService .Result > {
202+ private final boolean useActionSend ;
203+ public GeoLoadTask (boolean useActionSend ) {
204+ this .useActionSend = useActionSend ;
205+ }
199206
200207 @ Override
201208 protected ArticlesDownloadService .Result doInBackground (GeoPointDto ... arg0 ) {
@@ -222,7 +229,7 @@ private ArticlesDownloadService.Result translateGeoToFile(GeoPointDto geoPointFr
222229
223230 @ Override
224231 protected void onPostExecute (ArticlesDownloadService .Result result ) {
225- showResult (result );
232+ showResult (result , useActionSend );
226233 }
227234 }
228235
@@ -234,7 +241,7 @@ protected void onCreateEx(Bundle savedInstanceState) {
234241 GeoPointDto geoPointFromIntent = getGeoPointDtoFromIntent (getIntent ());
235242
236243 if (!geoConfig .showSettings && geoPointFromIntent != null && !GeoPointDto .isEmpty (geoPointFromIntent )) {
237- queryDataFromArticleServer (geoPointFromIntent , false );
244+ queryDataFromArticleServer (geoPointFromIntent , false , false );
238245 } else {
239246 setContentView (R .layout .activity_choose_url );
240247 gui = new Gui ().load (geoConfig );
@@ -248,20 +255,20 @@ protected void onCreateEx(Bundle savedInstanceState) {
248255 }
249256 }
250257
251- private void queryDataFromArticleServer (GeoPointDto geoPointFromIntent , boolean inDemoMode ) {
258+ private void queryDataFromArticleServer (GeoPointDto geoPointFromIntent , boolean inDemoMode , boolean useActionSend ) {
252259 geoConfig .inDemoMode = inDemoMode ;
253260 String name = createFileName (geoConfig .serviceName , geoPointFromIntent .getLatitude (), geoPointFromIntent .getLongitude ());
254261 File outFile = new File (
255262 createSharedOutDir (name ),
256263 name + geoConfig .outFileExtension );
257264 createSharedUri (outFile );
258265
259- new GeoLoadTask ().execute (geoPointFromIntent );
266+ new GeoLoadTask (useActionSend ).execute (geoPointFromIntent );
260267 }
261268
262269 /** called in gui thread, after receiving answer from wikipedia */
263270 @ SuppressLint ("StringFormatMatches" )
264- private void showResult (ArticlesDownloadService .Result result ) {
271+ private void showResult (ArticlesDownloadService .Result result , boolean useActionSend ) {
265272
266273 if (result .errorMessageId != 0 ) {
267274 showErrorMessage (getString (result .errorMessageId , geoConfig .serviceName , result .outFile , toString (geoConfig .demoUri ),"" ));
@@ -277,11 +284,24 @@ private void showResult(ArticlesDownloadService.Result result) {
277284
278285 Uri outUri = createSharedUri (result .outFile );
279286
280- Intent newIntent = new Intent (Intent .ACTION_VIEW )
281- .setFlags (Intent .FLAG_GRANT_READ_URI_PERMISSION );
282- newIntent .putExtra (Intent .EXTRA_TITLE , geoConfig .serviceName );
283-
284- newIntent .setDataAndTypeAndNormalize (outUri , geoConfig .outMimeType );
287+ Intent newIntent ;
288+ if (useActionSend ) {
289+ // https://developer.android.com/reference/android/content/Intent#ACTION_SEND
290+ newIntent = new Intent (Intent .ACTION_SEND )
291+ .setFlags (Intent .FLAG_GRANT_READ_URI_PERMISSION )
292+ .setType ("*/*" )
293+ .putExtra (Intent .EXTRA_TITLE , geoConfig .serviceName )
294+ .putExtra (Intent .EXTRA_STREAM , outUri );
295+ newIntent .setClipData (ClipData .newRawUri ("" , outUri ));
296+
297+ newIntent = Intent .createChooser (newIntent , geoConfig .serviceName );
298+ } else {
299+ // https://developer.android.com/reference/android/content/Intent#ACTION_VIEW
300+ newIntent = new Intent (Intent .ACTION_VIEW )
301+ .setFlags (Intent .FLAG_GRANT_READ_URI_PERMISSION )
302+ .putExtra (Intent .EXTRA_TITLE , geoConfig .serviceName )
303+ .setDataAndTypeAndNormalize (outUri , geoConfig .outMimeType );
304+ }
285305
286306 try {
287307 // start the image capture Intent
@@ -367,14 +387,18 @@ public boolean onPrepareOptionsMenu(Menu menu) {
367387 public boolean onOptionsItemSelected (MenuItem menuItem ) {
368388 save ();
369389 int itemId = menuItem .getItemId ();
390+ boolean isCmdShare = itemId == R .id .cmd_share ;
370391 if (itemId == R .id .cmd_cancel_pick ) {
371392 finish ();
372393 return true ;
373- } else if (itemId == R .id .cmd_ok ) {
394+ } else if (itemId == R .id .cmd_ok || isCmdShare ) {
374395 GeoPointDto geoPointFromIntent = getGeoPointDtoFromIntent (getIntent ());
375396
397+ if (geoPointFromIntent == null ) {
398+ geoPointFromIntent = new GeoConfig (this ).demoUri ;
399+ }
376400 if (geoPointFromIntent != null ) {
377- queryDataFromArticleServer (geoPointFromIntent , false );
401+ queryDataFromArticleServer (geoPointFromIntent , false , isCmdShare );
378402 } else {
379403 finish ();
380404 }
@@ -385,9 +409,9 @@ public boolean onOptionsItemSelected(MenuItem menuItem) {
385409
386410 }
387411
388- private void onStartQuery () {
412+ private void onStartQuery (boolean useActionSend ) {
389413 save ();
390- queryDataFromArticleServer (geoConfig .demoUri , true );
414+ queryDataFromArticleServer (geoConfig .demoUri , true , useActionSend );
391415 }
392416
393417 private void save () {
0 commit comments