Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fix, code cleanup

This commit is contained in:
nuclearfog 2019-11-11 20:18:33 +01:00
parent fa071ee908
commit ef6ee10dd7
No known key found for this signature in database
GPG Key ID: ED35E22099354A64
7 changed files with 58 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.idea/misc.xml
View File

@ -5,6 +5,45 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations>
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="androidx.annotation.Nullable" />
<option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="12">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="android.annotation.Nullable" />
<item index="7" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
<item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
<item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="11">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="android.annotation.NonNull" />
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
<item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8 (5)" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>

7
app/src/main/java/org/nuclearfog/twidda/backend/items/Tweet.java
View File

@ -70,9 +70,12 @@ public class Tweet {
myRetweetId = status.getCurrentUserRetweetId();
replyUserId = status.getInReplyToUserId();
// remove HTML tag
String api = status.getSource();
api = api.substring(api.indexOf('>') + 1);
api = api.substring(0, api.indexOf('<'));
int start = api.indexOf('>') + 1;
int end = api.lastIndexOf('<');
if (start > 0 && end > 0)
api = api.substring(start, end);
source = api;
Place place = status.getPlace();

8
app/src/main/java/org/nuclearfog/twidda/backend/items/TweetHolder.java
View File

@ -1,5 +1,7 @@
package org.nuclearfog.twidda.backend.items;
import android.location.Location;
import androidx.annotation.NonNull;
import org.nuclearfog.twidda.backend.helper.FilenameTools;
@ -42,9 +44,9 @@ public class TweetHolder {
}
}
public void addLocation(double[] location) {
this.latitude = location[0];
this.longitude = location[1];
public void addLocation(Location location) {
this.latitude = location.getLatitude();
this.longitude = location.getLongitude();
hasLocation = true;
}

12
app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
View File

@ -65,13 +65,13 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
@Nullable
private LocationManager mLocation;
private StatusUploader uploaderAsync;
private Location location;
private List<String> mediaPath;
private View mediaBtn, previewBtn, locationProg, locationBtn;
private TextView imgCount;
private EditText tweet;
private String addition = "";
private long inReplyId = 0;
private double[] gpsLocation;
private Mode mode = Mode.NONE;
private enum Mode {
@ -214,8 +214,8 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
TweetHolder tweet = new TweetHolder(tweetStr, inReplyId);
if (!mediaPath.isEmpty())
tweet.addMedia(mediaPath.toArray(new String[0]));
if (gpsLocation != null)
tweet.addLocation(gpsLocation);
if (location != null)
tweet.addLocation(location);
uploaderAsync = new StatusUploader(this, tweet);
uploaderAsync.execute();
}
@ -260,9 +260,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
@Override
public void onLocationChanged(Location location) {
gpsLocation = new double[2];
gpsLocation[0] = location.getLatitude();
gpsLocation[1] = location.getLongitude();
this.location = location;
Toast.makeText(this, R.string.info_gps_attached, LENGTH_LONG).show();
locationProg.setVisibility(INVISIBLE);
locationBtn.setVisibility(VISIBLE);
@ -281,7 +279,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
@Override
public void onProviderDisabled(String provider) {
if (gpsLocation == null)
if (location == null)
Toast.makeText(this, R.string.error_gps, LENGTH_LONG).show();
locationProg.setVisibility(INVISIBLE);
locationBtn.setVisibility(VISIBLE);

2
app/src/main/res/layout/page_editprofile.xml
View File

@ -49,7 +49,9 @@
android:background="@drawable/button"
android:maxLines="2"
android:paddingLeft="@dimen/editprofile_upload_button_padding"
android:paddingStart="@dimen/editprofile_upload_button_padding"
android:paddingRight="@dimen/button_padding"
android:paddingEnd="@dimen/button_padding"
app:drawableLeftCompat="@drawable/upload"
app:drawableStartCompat="@drawable/upload" />

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

@ -123,6 +123,6 @@
<string name="info_not_implemented">Diese Funktion wurde noch nicht hinzugefügt!</string>
<string name="error_cant_copy_clipboard">Link konnte nicht kopiert werden!</string>
<string name="info_gps_attached">GPS Position hinzugefügt</string>
<string name="info_get_location">starte GPS lokalisierung...</string>
<string name="info_get_location">starte GPS lokalisierung…</string>
<string name="error_gps">GPS lokalisierung fehlgeschlagen!</string>
</resources>

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

@ -124,6 +124,6 @@
<string name="info_not_implemented">This function is not implemented yet!</string>
<string name="error_cant_copy_clipboard">can\'t copy link to clipboard!</string>
<string name="info_gps_attached">GPS position added</string>
<string name="info_get_location">starting location...</string>
<string name="info_get_location">starting location…</string>
<string name="error_gps">could not fetch GPS data!</string>
</resources>