Skip to content

Commit 354193a

Browse files
ScrewTSWScrewTSW
committed
Added an option to share image from URL
1 parent 3c0de58 commit 354193a

File tree

6 files changed

+65
-66
lines changed

6 files changed

+65
-66
lines changed

‎.idea/misc.xml

-38
This file was deleted.

‎app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "eu.dasancti.reversee"
77
minSdkVersion 21
88
targetSdkVersion 28
9-
versionCode 1
10-
versionName "1.0"
9+
versionCode 2
10+
versionName "ALPHA v0.3"
1111
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1212
}
1313
buildTypes {

‎app/src/main/AndroidManifest.xml

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
<category android:name="android.intent.category.DEFAULT" />
1717
<data android:mimeType="image/*" />
1818
</intent-filter>
19+
<intent-filter>
20+
<action android:name="android.intent.action.SEND" />
21+
<category android:name="android.intent.category.DEFAULT" />
22+
<data android:mimeType="text/plain" />
23+
</intent-filter>
1924
</activity>
2025
</application>
2126
</manifest>

‎app/src/main/java/eu/dasancti/reversee/MainActivity.java

+53-24
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
public class MainActivity extends AppCompatActivity {
3232

3333
private static final String GOOGLE_REVERSE_IMAGE_SEARCH_URL = "https://www.google.com/searchbyimage/upload";
34+
private static final String GOOGLE_REVERSE_IMAGE_SEARCH_URL_BY_URL = "https://www.google.com/searchbyimage?&image_url=";
3435
private static final String FAKE_USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11";
3536
private static final String API_SCH_KEY = "sch";
3637
private static final String API_SCH_VALUE = "sch";
@@ -49,38 +50,67 @@ protected void onCreate(Bundle savedInstanceState) {
4950
progressStatus = findViewById(R.id.progressStatus);
5051

5152
Intent intent = getIntent();
53+
if (intent == null) {
54+
Toast.makeText(MainActivity.this, "No intent sent to application, closing.", Toast.LENGTH_SHORT).show();
55+
this.finish();
56+
return;
57+
}
5258
String action = intent.getAction();
5359
if (action == null) {
5460
Toast.makeText(MainActivity.this, "No action sent to application, closing.", Toast.LENGTH_SHORT).show();
5561
this.finish();
5662
return;
5763
}
58-
if (isPermissionGranted()) {
59-
if (action.equals(Intent.ACTION_SEND)) {
60-
progressStatus.setText(getString(R.string.progress_status_recieved_intent));
61-
try {
62-
handleImageSearch(intent.getParcelableExtra(Intent.EXTRA_STREAM));
63-
} catch (FileNotFoundException e) {
64-
String err = "Failed to handle Share image intent:"+e.getMessage();
65-
Log.e("INTENT_HANDLE",err);
66-
Toast.makeText(getApplicationContext(), err, Toast.LENGTH_SHORT).show();
64+
if (action.equals(Intent.ACTION_SEND)) {
65+
if (intent.hasExtra(Intent.EXTRA_TEXT)) {
66+
String intentExtraText = intent.getParcelableExtra(Intent.EXTRA_TEXT).toString();
67+
progressStatus.setText(getString(R.string.progress_status_parsing_link));
68+
if (intentExtraText.endsWith(".jpg") ||
69+
intentExtraText.endsWith(".png") ||
70+
intentExtraText.endsWith(".gif") ||
71+
intentExtraText.endsWith(".webp")) {
72+
progressStatus.setText(getString(R.string.progress_status_opening_from_url));
73+
Toast.makeText(MainActivity.this, getString(R.string.progress_status_opening_from_url), Toast.LENGTH_SHORT).show();
74+
Intent searchIntent = new Intent();
75+
searchIntent.setAction(Intent.ACTION_VIEW);
76+
searchIntent.setData(Uri.parse(GOOGLE_REVERSE_IMAGE_SEARCH_URL_BY_URL.concat(intentExtraText)));
77+
startActivity(searchIntent);
78+
MainActivity.this.finish();
79+
} else {
80+
progressStatus.setText(getString(R.string.progress_status_unsupported_format));
81+
Toast.makeText(MainActivity.this, getString(R.string.progress_status_unsupported_format), Toast.LENGTH_SHORT).show();
82+
this.finish();
83+
}
84+
} else if (intent.hasExtra(Intent.EXTRA_STREAM)) {
85+
if (isPermissionGranted()) {
86+
progressStatus.setText(getString(R.string.progress_status_recieved_intent));
87+
try {
88+
handleImageSearch(intent.getParcelableExtra(Intent.EXTRA_STREAM));
89+
} catch (FileNotFoundException e) {
90+
String err = "Failed to handle Share image intent:" + e.getMessage();
91+
Log.e("INTENT_HANDLE", err);
92+
Toast.makeText(getApplicationContext(), err, Toast.LENGTH_SHORT).show();
93+
}
94+
} else {
95+
AlertDialog.Builder builder = new AlertDialog.Builder(this);
96+
builder.setTitle("Read storage permission required.");
97+
builder.setMessage("This application requires READ_EXTERNAL_STORAGE permission in order to function properly.");
98+
builder.setPositiveButton("Grant permission", (dialog, which) -> {
99+
ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_PERMISSION_EXTERNAL_STORAGE_STATE);
100+
if (action.equals(Intent.ACTION_SEND)) {
101+
requestPermissionsFallbackUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
102+
}
103+
});
104+
builder.setNegativeButton("Deny permission", ((dialog, which) -> {
105+
Toast.makeText(MainActivity.this, "Permission not granted, closing.", Toast.LENGTH_SHORT).show();
106+
this.finish();
107+
}));
108+
builder.create().show();
67109
}
68110
}
69111
} else {
70-
android.support.v7.app.AlertDialog.Builder builder = new AlertDialog.Builder(this);
71-
builder.setTitle("Read storage permission required.");
72-
builder.setMessage("This application requires READ_EXTERNAL_STORAGE permission in order to function properly.");
73-
builder.setPositiveButton("Grant permission", (dialog, which) -> {
74-
ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_PERMISSION_EXTERNAL_STORAGE_STATE);
75-
if (action.equals(Intent.ACTION_SEND)) {
76-
requestPermissionsFallbackUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
77-
}
78-
});
79-
builder.setNegativeButton("Deny permission", ((dialog, which) -> {
80-
Toast.makeText(MainActivity.this, "Permission not granted, closing.", Toast.LENGTH_SHORT).show();
81-
this.finish();
82-
}));
83-
builder.create().show();
112+
Toast.makeText(MainActivity.this, "Unhandled action sent to application, closing.", Toast.LENGTH_SHORT).show();
113+
this.finish();
84114
}
85115
}
86116

@@ -156,7 +186,6 @@ public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Thr
156186
}
157187
}
158188
});
159-
// TODO: Display spinner until requestHandle.isFinished() is true
160189
}
161190

162191
private boolean isPermissionGranted() {

‎app/src/main/res/layout/activity_main.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<TextView
2121
android:layout_width="wrap_content"
2222
android:layout_height="wrap_content"
23-
android:text="We are processing your queue."
23+
android:text="We are processing your querry."
2424
app:layout_constraintBottom_toBottomOf="parent"
2525
app:layout_constraintLeft_toLeftOf="parent"
2626
app:layout_constraintRight_toRightOf="parent"

‎app/src/main/res/values/strings.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<resources>
22
<string name="app_name">Reversee</string>
3-
<string name="progress_status_recieved_intent">Recieved intent data (image share)</string>
3+
<string name="progress_status_recieved_intent">Received intent data (image share)</string>
44
<string name="progress_status_handling_image">Handling google reverse image search.</string>
55
<string name="progress_status_response_success">Google request successful.</string>
66
<string name="progress_status_redirect_found">Found redirect URL, opening browser intent.</string>
7+
<string name="progress_status_parsing_link">Parsing URL from share.</string>
8+
<string name="progress_status_unsupported_format">Unsupported file format from link.</string>
9+
<string name="progress_status_opening_from_url">Opening browser with shared URL</string>
710
</resources>

0 commit comments

Comments
 (0)