Mastodon/Shitter-android-app
1
0
Fork 0
mirror of https://github.com/nuclearfog/Shitter.git synced 2025-01-01 04:17:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix, added toast messages

Browse Source 
Signed-off-by: nuclearfog <hatespirit666@gmail.com>
This commit is contained in:
nuclearfog 2021-10-22 19:56:08 +02:00
parent 4b99a07007
commit f624d18d6f
No known key found for this signature in database
GPG Key ID: AA0271FBE406DB98
4 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/java/org/nuclearfog/twidda/activity/MediaActivity.java
View File

@ -14,6 +14,7 @@ import static android.provider.MediaStore.Images.Media.DISPLAY_NAME;
import static android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
import static android.provider.MediaStore.Images.Media.MIME_TYPE;
import static android.provider.MediaStore.Images.Media.RELATIVE_PATH;
import static android.widget.Toast.LENGTH_LONG;
import static android.widget.Toast.LENGTH_SHORT;
import android.content.ActivityNotFoundException;
@ -134,24 +135,35 @@ public abstract class MediaActivity extends AppCompatActivity implements Locatio
@Override
public final void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
public final void onRequestPermissionsResult(final int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (permissions.length > 0 && grantResults.length > 0) {
// read storage permission granted
if (PERMISSIONS[0][0].equals(permissions[0])) {
if (grantResults[0] == PERMISSION_GRANTED) {
openMediaPicker(requestCode);
}
if (PERMISSIONS[0][0].equals(permissions[0]) && grantResults[0] == PERMISSION_GRANTED) {
runOnUiThread(new Runnable() {
@Override
public void run() {
openMediaPicker(requestCode);
}
});
}
// location permission granted
else if (PERMISSIONS[1][0].equals(permissions[0])) {
getLocation(false);
runOnUiThread(new Runnable() {
@Override
public void run() {
getLocation(false);
}
});
}
// Write storage permissions granted
else if (PERMISSIONS[2][0].equals(permissions[0])) {
if (grantResults[0] == PERMISSION_GRANTED) {
saveImage();
}
else if (PERMISSIONS[2][0].equals(permissions[0]) && grantResults[0] == PERMISSION_GRANTED) {
runOnUiThread(new Runnable() {
@Override
public void run() {
saveImage();
}
});
}
}
}
@ -181,15 +193,15 @@ public abstract class MediaActivity extends AppCompatActivity implements Locatio
@Override
public final void onLocationChanged(@NonNull Location location) {
onAttachLocation(location);
locationPending = false;
onAttachLocation(location);
}
@Override
public final void onProviderDisabled(@NonNull String provider) {
onAttachLocation(null);
locationPending = false;
onAttachLocation(null);
}
@ -239,11 +251,11 @@ public abstract class MediaActivity extends AppCompatActivity implements Locatio
* called when an image was successfully saved to external storage
*/
public void onImageSaved() {
Toast.makeText(getApplicationContext(), R.string.info_image_saved, Toast.LENGTH_LONG).show();
Toast.makeText(this, R.string.info_image_saved, LENGTH_SHORT).show();
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
// start media scanner to scan for new image
String[] fileName = {filename};
MediaScannerConnection.scanFile(getApplicationContext(), fileName, null, null);
MediaScannerConnection.scanFile(this, fileName, null, null);
}
}
@ -251,7 +263,7 @@ public abstract class MediaActivity extends AppCompatActivity implements Locatio
* called when an error occurs while storing image
*/
public void onError() {
Toast.makeText(getApplicationContext(), R.string.error_image_save, Toast.LENGTH_SHORT).show();
Toast.makeText(this, R.string.error_image_save, Toast.LENGTH_SHORT).show();
}
/**
@ -268,6 +280,8 @@ public abstract class MediaActivity extends AppCompatActivity implements Locatio
return;
}
} else if (ask) {
if (shouldShowRequestPermissionRationale(PERMISSIONS[1][0]))
Toast.makeText(this, R.string.info_permission_location, LENGTH_LONG).show();
requestPermissions(PERMISSIONS[1], REQ_CHECK_PERM);
return;
}
@ -283,6 +297,8 @@ public abstract class MediaActivity extends AppCompatActivity implements Locatio
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || checkSelfPermission(PERMISSIONS[0][0]) == PERMISSION_GRANTED) {
openMediaPicker(requestCode);
} else {
if (shouldShowRequestPermissionRationale(PERMISSIONS[0][0]))
Toast.makeText(this, R.string.info_permission_read, LENGTH_LONG).show();
requestPermissions(PERMISSIONS[0], requestCode);
}
}
@ -303,6 +319,8 @@ public abstract class MediaActivity extends AppCompatActivity implements Locatio
|| checkSelfPermission(PERMISSIONS[2][0]) == PERMISSION_GRANTED) {
saveImage();
} else {
if (shouldShowRequestPermissionRationale(PERMISSIONS[2][0]))
Toast.makeText(this, R.string.info_permission_write, LENGTH_LONG).show();
requestPermissions(PERMISSIONS[2], REQUEST_STORE_IMG);
}
}
@ -344,13 +362,12 @@ public abstract class MediaActivity extends AppCompatActivity implements Locatio
try {
startActivityForResult(mediaSelect, requestCode);
} catch (ActivityNotFoundException err) {
Toast.makeText(getApplicationContext(), R.string.error_no_media_app, LENGTH_SHORT).show();
Toast.makeText(this, R.string.error_no_media_app, LENGTH_SHORT).show();
}
}
/**
* called when location information was successfully fetched
* it isn't safe to update views over this method
*
* @param location location information
*/

2
app/src/main/java/org/nuclearfog/twidda/activity/TweetEditor.java
View File

@ -222,6 +222,8 @@ public class TweetEditor extends MediaActivity implements OnClickListener, OnPro
} else {
Toast.makeText(this, R.string.error_gps, LENGTH_LONG).show();
}
locationPending.setVisibility(INVISIBLE);
locationBtn.setVisibility(VISIBLE);
this.location = location;
}

5
app/src/main/res/values-de-rDE/strings.xml
View File

@ -133,7 +133,7 @@
<string name="tweet_sensitive_media">Sensible Inhalte</string>
<string name="login_info">3 Schritte zum Login</string>
<string name="info_fetching_link">öffne Twitter login Seite</string>
<string name="info_login_to_twitter">Melde in Twitter an</string>
<string name="info_login_to_twitter">In Twitter einloggen</string>
<string name="userlist_public_sel">öffentlich</string>
<string name="userlist_enter_title">Titel eingeben</string>
<string name="userlist_enter_description">Beschreibung der Liste eingeben</string>
@ -216,4 +216,7 @@
<string name="info_refreshing_exclude_list">aktualisiere Filterliste</string>
<string name="info_exclude_list_updated">Filterliste aktualisiert!</string>
<string name="menu_licenses">Lizenzen</string>
<string name="info_permission_write">Schreibrechte werden benötigt um Bilder zu speichern.</string>
<string name="info_permission_read">Leserechte werden benötigt um Bilder und Videos einzufügen.</string>
<string name="info_permission_location">Standortinformationen werden ausschließlich für Tweets verwendet.</string>
</resources>

3
app/src/main/res/values/strings.xml
View File

@ -156,6 +156,9 @@
<string name="info_location_pending">Location is pending, please wait.</string>
<string name="info_refreshing_exclude_list">refreshing exclude list</string>
<string name="info_exclude_list_updated">exclude list updated!</string>
<string name="info_permission_read">Read permission needed to access images and videos</string>
<string name="info_permission_location">Location permission only needed to add location information to tweets.</string>
<string name="info_permission_write">Write permission used to store images.</string>
<string name="info_error">Error</string>
<!-- toast messages for error information -->