Skip to content

Commit b2b74cc

Browse files
author
Salvatore Penitente
authored
Merge pull request #10 from backsofangels/refactoring
Removed unnecessary dependences and fixed strings.xml
2 parents be4ecc4 + df7edfd commit b2b74cc

7 files changed

Lines changed: 7 additions & 46 deletions

File tree

app/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ dependencies {
3737
implementation 'com.android.support:recyclerview-v7:28.0.0'
3838
implementation 'com.android.support:cardview-v7:28.0.0'
3939
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
40-
implementation "ch.acra:acra-mail:$acraversion"
41-
implementation "ch.acra:acra-notification:$acraversion"
42-
implementation 'com.deploygate:sdk:4.1.0'
4340
testImplementation 'junit:junit:4.12'
4441
androidTestImplementation 'com.android.support.test:runner:1.0.2'
4542
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:hardwareAccelerated="true"
1313
android:icon="@mipmap/ic_launcher"
1414
android:label="@string/app_name"
15-
android:roundIcon="@mipmap/ic_android_light_round"
15+
android:roundIcon="@mipmap/ic_android_dark_round"
1616
android:supportsRtl="true"
1717
android:theme="@style/AppTheme"
1818
tools:ignore="GoogleAppIndexingWarning">
Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
11
package com.backsofangels.justreadit;
22

33
import android.app.Application;
4-
import android.app.NotificationChannel;
5-
import android.app.NotificationManager;
6-
import android.content.Context;
7-
import android.os.Build;
8-
9-
import org.acra.ACRA;
10-
import org.acra.annotation.AcraCore;
11-
import org.acra.annotation.AcraMailSender;
12-
import org.acra.annotation.AcraNotification;
134

145
import io.realm.Realm;
156
import io.realm.RealmConfiguration;
167

17-
@AcraCore(buildConfigClass = BuildConfig.class)
18-
@AcraMailSender(mailTo = "backsofangels@gmail.com", reportAsFile = true, reportFileName = "JustReadIt-ACRA-report.stacktrace", resSubject = R.string.acrareport_mailsubject)
19-
@AcraNotification(resChannelName = R.string.acrareport_notificationchannel_name, resTitle = R.string.acrareport_notification_title, resText = R.string.acrareport_notification_text)
208
public class JustreaditApplication extends Application {
219
//Realm DB setup
2210
@Override
@@ -27,26 +15,5 @@ public void onCreate() {
2715
.name("justreadit.realm")
2816
.build();
2917
Realm.setDefaultConfiguration(CONF);
30-
createNotificationChannel();
31-
}
32-
33-
//ACRA (crash report service) configuration
34-
@Override
35-
protected void attachBaseContext(Context base) {
36-
super.attachBaseContext(base);
37-
ACRA.init(this);
38-
}
39-
40-
private void createNotificationChannel() {
41-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
42-
CharSequence name = getString(R.string.acrareport_notificationchannel_name);
43-
String description = getString(R.string.acrareport_notificationchannel_description);
44-
String channelId = getString(R.string.acrareport_notificationchannel_id);
45-
int importance = NotificationManager.IMPORTANCE_DEFAULT;
46-
NotificationChannel channel = new NotificationChannel(channelId, name, importance);
47-
channel.setDescription(description);
48-
NotificationManager notificationManager = getSystemService(NotificationManager.class);
49-
notificationManager.createNotificationChannel(channel);
50-
}
5118
}
5219
}

app/src/main/java/com/backsofangels/justreadit/persistence/ScannedLinkDao.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public void execute(@Nonnull Realm realm) {
5656

5757
public ArrayList<ScannedLink> retrieveLinks() {
5858
ArrayList<ScannedLink> queryResult = new ArrayList<>();
59-
System.out.println("Retrieving");
6059
try {
6160
queryResult.addAll(r.where(ScannedLink.class).findAll());
6261
} catch (RealmException e) {

app/src/main/java/com/backsofangels/justreadit/ui/main/MainActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
5353
@Override
5454
public boolean onOptionsItemSelected(MenuItem item) {
5555
if (item.getItemId() == R.id.open_source_licenses) {
56-
System.out.println("starto la nuova activity");
5756
Intent intent = new Intent(this, MenuActivity.class);
5857
startActivity(intent);
5958
return true;

app/src/main/java/com/backsofangels/justreadit/ui/qrcodefragment/QRCodeReaderFragment.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ public void barcodeResult(BarcodeResult result) {
3737
return;
3838
}
3939
scannedText = result.getText();
40-
System.out.println("Found QR. URI is " + scannedText);
4140
ScannedLink l = new ScannedLink(scannedText, new Date());
4241
dao.saveLink(l);
43-
Snackbar scanDoneNotification = Snackbar.make(getView(), "Link scannerizzato!", Snackbar.LENGTH_LONG);
44-
scanDoneNotification.setAction("Vedi", new ChangePageListener());
42+
Snackbar scanDoneNotification = Snackbar.make(getView(), "Link scanned!", Snackbar.LENGTH_LONG);
43+
scanDoneNotification.setAction("Go", new ChangePageListener());
4544
scanDoneNotification.show();
4645
}
4746

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<string name="scanhistory_tab_title">Link history</string>
55
<string name="acrareport_mailsubject">ACRA JustReadIt crash report</string>
66
<string name="acrareport_notification_title">Just Read it crash!</string>
7-
<string name="acrareport_notification_text">Ops, Just Read It è crashata. Mandami un report per risolvere il problema!</string>
7+
<string name="acrareport_notification_text">Ops, Just Read It crashed. Send a report to make me investigate!</string>
88
<string name="acrareport_notificationchannel_name">Crash report</string>
9-
<string name="acrareport_notificationchannel_description">Notifica un crash che è poi possibile inviare allo sviluppatore</string>
9+
<string name="acrareport_notificationchannel_description">Notifies a crash and generates a report that can be sent to the developer</string>
1010
<string name="acrareport_notificationchannel_id">ACRA_crash_report</string>
11-
<string name="menu_item_licenses">Licenze open source</string>
12-
<string name="licenses">Questa app è stata realizzata secondo la licenza GNU GPL 3.0.\nL\'intero codice sorgente è visualizzabile al seguente link\n<a href="https://github.com/backsofangels/justreadit">https://github.com/backsofangels/justreadit</a>\nSono state usate le librerie open source Zxing, Zxing-android-embedded ed ACRA crash reports.\nPer qualsiasi necessità, domanda o feedback, contattami all\'indirizzo\nbacksofangels@gmail.com</string>
11+
<string name="menu_item_licenses">Open source licenses</string>
12+
<string name="licenses">This app was developed under GNU GPL 3.0.\nThe whole source code can be seen at\n<a href="https://github.com/backsofangels/justreadit">https://github.com/backsofangels/justreadit</a>\nThe libraries Zxing, Zxing-android-embedded and ACRA crash reports have been used.\nFor every question or feedback, mail me to\nbacksofangels@gmail.com</string>
1313
</resources>

0 commit comments

Comments
 (0)